build: debian bookworm, update go deps (#404)

* build(docker): debian bookworm * test: reset golden * test: update golden files * build: debian bookworm, update go deps
cshum · Nov 19, 2023 · 74683a9 · 74683a9
1 parent 410b6c8
commit 74683a9
Show file tree

Hide file tree

Showing 60 changed files with 134 additions and 155 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,36 +5,32 @@ on: [push, pull_request]
 jobs:
   build:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       CGO_CFLAGS_ALLOW: -Xpreprocessor
       VIPS_VERSION: 8.14.5
-      V: 5
+      V: 6
 
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.20
+          go-version: ^1.21
 
       - name: Check out code
         uses: actions/checkout@v2
 
       - name: Install linux dependencies
         run: |
-          sudo add-apt-repository -y ppa:lovell/cgif
-          sudo add-apt-repository -y ppa:strukturag/libde265
-          sudo add-apt-repository -y ppa:strukturag/libheif
           sudo apt-get update
           sudo apt-get install -y \
-          python3-pip ninja-build \
-          glib-2.0-dev libexpat-dev librsvg2-dev libpng-dev \
+          meson ninja-build \
+          libglib2.0-dev libexpat-dev librsvg2-dev libpng-dev \
           libjpeg-turbo8-dev libimagequant-dev libfftw3-dev \
           libpoppler-glib-dev libxml2-dev \
           libopenslide-dev libcfitsio-dev liborc-0.4-dev libpango1.0-dev \
           libtiff5-dev libgsf-1-dev giflib-tools libwebp-dev libheif-dev \
           libopenjp2-7-dev libcgif-dev
-          sudo pip3 install meson
 
       - name: Cache libvips
         uses: actions/cache@v3

diff --git a/Dockerfile b/Dockerfile
@@ -1,47 +1,23 @@
-ARG GOLANG_VERSION=1.20.8
-FROM golang:${GOLANG_VERSION}-bullseye as builder
+ARG GOLANG_VERSION=1.21.4
+FROM golang:${GOLANG_VERSION}-bookworm as builder
 
 ARG VIPS_VERSION=8.14.5
-ARG CGIF_VERSION=0.3.0
-ARG LIBSPNG_VERSION=0.7.3
 ARG TARGETARCH
 
 ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
-# libaom3 is in Debian bullseye-backports
-RUN echo 'deb http://deb.debian.org/debian bullseye-backports main' > /etc/apt/sources.list.d/backports.list
-
 # Installs libvips + required libraries
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update && \
   apt-get install --no-install-recommends -y \
   ca-certificates \
   automake build-essential curl \
-  python3-pip ninja-build pkg-config \
+  meson ninja-build pkg-config \
   gobject-introspection gtk-doc-tools libglib2.0-dev libjpeg62-turbo-dev libpng-dev \
-  libwebp-dev libtiff5-dev libexif-dev libxml2-dev libpoppler-glib-dev \
+  libwebp-dev libtiff-dev libexif-dev libxml2-dev libpoppler-glib-dev \
   swig libpango1.0-dev libmatio-dev libopenslide-dev libcfitsio-dev libopenjp2-7-dev liblcms2-dev \
-  libgsf-1-dev fftw3-dev liborc-0.4-dev librsvg2-dev libimagequant-dev libaom-dev/bullseye-backports libheif-dev && \
-  pip3 install meson && \
-  cd /tmp && \
-    curl -fsSLO https://github.com/dloebl/cgif/archive/refs/tags/V${CGIF_VERSION}.tar.gz && \
-    tar xf V${CGIF_VERSION}.tar.gz && \
-    cd cgif-${CGIF_VERSION} && \
-    meson build --prefix=/usr/local --libdir=/usr/local/lib --buildtype=release && \
-    cd build && \
-    ninja && \
-    ninja install && \
-  cd /tmp && \
-    curl -fsSLO https://github.com/randy408/libspng/archive/refs/tags/v${LIBSPNG_VERSION}.tar.gz && \
-    tar xf v${LIBSPNG_VERSION}.tar.gz && \
-    cd libspng-${LIBSPNG_VERSION} && \
-    meson setup _build \
-      --buildtype=release \
-      --strip \
-      --prefix=/usr/local \
-      --libdir=lib && \
-    ninja -C _build && \
-    ninja -C _build install && \
+  libgsf-1-dev libfftw3-dev liborc-0.4-dev librsvg2-dev libimagequant-dev libaom-dev \
+  libheif-dev libspng-dev libcgif-dev && \
   cd /tmp && \
     curl -fsSLO https://github.com/libvips/libvips/releases/download/v${VIPS_VERSION}/vips-${VIPS_VERSION}.tar.xz && \
     tar xf vips-${VIPS_VERSION}.tar.xz && \
@@ -57,7 +33,6 @@ RUN DEBIAN_FRONTEND=noninteractive \
     ninja -C _build && \
     ninja -C _build install && \
   ldconfig && \
-  rm -rf /usr/local/lib/python* && \
   rm -rf /usr/local/lib/libvips-cpp.* && \
   rm -rf /usr/local/lib/*.a && \
   rm -rf /usr/local/lib/*.la
@@ -74,21 +49,21 @@ COPY . .
 RUN if [ "$TARGETARCH" = "amd64" ]; then go test ./...; fi
 RUN go build -o ${GOPATH}/bin/imagor ./cmd/imagor/main.go
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 LABEL maintainer="adrian@cshum.com"
 
 COPY --from=builder /usr/local/lib /usr/local/lib
 COPY --from=builder /etc/ssl/certs /etc/ssl/certs
-COPY --from=builder /etc/apt/sources.list.d/backports.list /etc/apt/sources.list.d/backports.list
 
 # Install runtime dependencies
 RUN DEBIAN_FRONTEND=noninteractive \
   apt-get update && \
   apt-get install --no-install-recommends -y \
-  procps libglib2.0-0 libjpeg62-turbo libpng16-16 libopenexr25 \
-  libwebp6 libwebpmux3 libwebpdemux2 libtiff5 libexif12 libxml2 libpoppler-glib8 \
+  procps libglib2.0-0 libjpeg62-turbo libpng16-16 libopenexr-3-1-30 \
+  libwebp7 libwebpmux3 libwebpdemux2 libtiff6 libexif12 libxml2 libpoppler-glib8 \
   libpango1.0-0 libmatio11 libopenslide0 libopenjp2-7 libjemalloc2 \
-  libgsf-1-114 fftw3 liborc-0.4-0 librsvg2-2 libcfitsio9 libimagequant0 libaom3 libheif1 && \
+  libgsf-1-114 libfftw3-bin liborc-0.4-0 librsvg2-2 libcfitsio10 libimagequant0 libaom3 libheif1 \
+  libspng0 libcgif0 && \
   ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so && \
   apt-get autoremove -y && \
   apt-get autoclean && \

diff --git a/go.mod b/go.mod
@@ -3,64 +3,63 @@ module github.com/cshum/imagor
 go 1.19
 
 require (
-	cloud.google.com/go/storage v1.33.0
-	github.com/aws/aws-sdk-go v1.45.16
-	github.com/fsouza/fake-gcs-server v1.44.2
-	github.com/johannesboyne/gofakes3 v0.0.0-20230129080941-f6a8a9ae6fd3
+	cloud.google.com/go/storage v1.35.1
+	github.com/aws/aws-sdk-go v1.48.0
+	github.com/fsouza/fake-gcs-server v1.47.6
+	github.com/johannesboyne/gofakes3 v0.0.0-20230914150226-f005f5cc03aa
 	github.com/peterbourgon/ff/v3 v3.4.0
-	github.com/prometheus/client_golang v1.16.0
-	github.com/rs/cors v1.10.0
+	github.com/prometheus/client_golang v1.17.0
+	github.com/rs/cors v1.10.1
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/zap v1.26.0
-	golang.org/x/image v0.12.0
-	golang.org/x/sync v0.3.0
+	golang.org/x/image v0.14.0
+	golang.org/x/sync v0.5.0
 )
 
 require (
-	cloud.google.com/go v0.110.8 // indirect
-	cloud.google.com/go/compute v1.23.0 // indirect
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
-	cloud.google.com/go/iam v1.1.2 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
 	cloud.google.com/go/pubsub v1.33.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/renameio/v2 v2.0.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
-	github.com/google/uuid v1.3.1 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
+	github.com/google/uuid v1.4.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
-	github.com/gorilla/handlers v1.5.1 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/handlers v1.5.2 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/pkg/xattr v0.4.9 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
 	github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
-	golang.org/x/net v0.15.0 // indirect
-	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
-	google.golang.org/api v0.143.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/tools v0.15.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/api v0.151.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
-	google.golang.org/grpc v1.58.2 // indirect
+	google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )