Switch from alpine to debian for CI (#259)

* Switch from alpine to debian

Author: bplunkett-stripe

.github/workflows/run-tests.yaml

@@ -13,18 +13,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - base_image: "golang:1.20.14-alpine3.19"
-            pg_package: "postgresql14"
-          - base_image: "golang:1.20.14-alpine3.19"
-            pg_package: "postgresql15"
-          - base_image: "golang:1.20.14-alpine3.19"
-            pg_package: "postgresql16"
-          - base_image: "golang:1.22.10-alpine3.21"
-            pg_package: "postgresql17"
+          - pg_version: "14"
+          - pg_version: "15"
+          - pg_version: "16"
+          - pg_version: "17"
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Build Docker image
-        run: docker build -t pg-schema-diff-test-runner -f ./build/Dockerfile.test --build-arg BASE_IMAGE=${{ matrix.base_image }} --build-arg POSTGRES_PACKAGE=${{ matrix.pg_package }} .
+        run: docker build -t pg-schema-diff-test-runner -f ./build/Dockerfile.test --build-arg PG_VERSION=${{ matrix.pg_version }} .
       - name: Run tests
         run: docker run pg-schema-diff-test-runner

build/Dockerfile.codegen

@@ -1,10 +1,10 @@
-FROM golang:1.20.14-alpine3.19
+FROM golang:1.20-bookworm
 
-RUN apk update && \
-    apk add --no-cache  \
-      build-base \
-      git \
-      make
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        git \
+        make \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN go install -tags=nowasm github.com/kyleconroy/sqlc/cmd/[email protected]
 ENTRYPOINT make code_gen

build/Dockerfile.lint

@@ -1,17 +1,19 @@
-# Use a newer version of go to appease #golangci-lint
-FROM golang:1.20.6-alpine3.18
+FROM golang:1.20-bookworm
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        make \
+        python3 \
+        python3-pip \
+        wget \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN apk update && \
-    apk add --no-cache  \
-      make \
-      python3 \
-      py3-pip
 # Install golang-ci-lint
 RUN wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.56.2
-# Install sqlfluff
-RUN pip install wheel # It complains if we attempt to install this in the same command as Cython
-RUN pip install "Cython<3.0" pyyaml --no-build-isolation # Fix for https://github.com/yaml/pyyaml/issues/601
-RUN pip install "sqlfluff==3.3.0"
+
+# Install sqlfluff (use --break-system-packages for Debian 12+)
+RUN pip install --break-system-packages wheel
+RUN pip install --break-system-packages "Cython<3.0" pyyaml --no-build-isolation
+RUN pip install --break-system-packages "sqlfluff==3.3.0"
 
 WORKDIR /pg-schema-diff
 COPY . .

build/Dockerfile.test

@@ -1,15 +1,26 @@
-ARG BASE_IMAGE=golang:1.20.14-alpine3.19
+FROM golang:1.22-bookworm
 
-FROM $BASE_IMAGE
+ARG PG_VERSION=14
 
-ARG POSTGRES_PACKAGE=postgresql14
-RUN apk update && \
-    apk add --no-cache  \
-      build-base \
-      make \
-      $POSTGRES_PACKAGE \
-      $POSTGRES_PACKAGE-contrib \
-      $POSTGRES_PACKAGE-client
+# Install build dependencies and PostgreSQL from official apt repository
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        build-essential \
+        make \
+        gnupg \
+        wget \
+        ca-certificates \
+        lsb-release \
+    && apt install -y postgresql-common \
+    && YES=yes /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+        postgresql-${PG_VERSION} \
+        postgresql-contrib-${PG_VERSION} \
+        postgresql-client-${PG_VERSION} \
+    && rm -rf /var/lib/apt/lists/*
+
+# Add PostgreSQL bin directory to PATH (Debian installs to /usr/lib/postgresql/<version>/bin/)
+ENV PATH="/usr/lib/postgresql/${PG_VERSION}/bin:${PATH}"
 
 WORKDIR /pg-schema-diff
 
@@ -20,7 +31,7 @@ RUN go mod download
 
 # Run all tests from non-root. This will also prevent Postgres from complaining when
 # we try to launch it within tests
-RUN adduser --disabled-password --gecos '' testrunner
+RUN useradd --create-home testrunner
 USER testrunner
 
 # Run tests serially so logs can be streamed. Set overall timeout to 30m (the default is 10m, which is not enough)

internal/pgdump/dump.go

@@ -19,8 +19,6 @@ const (
 var (
 	// versionRe matches the version returned by pg_dump.
 	versionRe = regexp.MustCompile(`pg_dump \(PostgreSQL\) (\d+(?:\.\d+)?)`)
-
-	version15 = version.Must(version.NewSemver("15.0"))
 )
 
 // Parameter represents a parameter to be pg_dump. Don't use a type alias for a string slice
@@ -50,8 +48,6 @@ func WithSchemaOnly() Parameter {
 func WithRestrictKey(restrictKey string) Parameter {
 	return Parameter{
 		values: []string{"--restrict-key", restrictKey},
-		// Added in 17.6. https://www.postgresql.org/docs/release/17.6/.
-		minimumVersion: version15,
 	}
 }