Gocardless v0.17.0+

Dockerfile

@@ -2,7 +2,7 @@
 # build
 ################################################################################
 
-FROM golang:1.14.2 AS build
+FROM golang:1.17.8 AS build
 COPY . /go/src/github.com/gocardless/stolon-pgbouncer
 WORKDIR /go/src/github.com/gocardless/stolon-pgbouncer
 
@@ -19,7 +19,7 @@ RUN set -x \
 # release
 ################################################################################
 
-FROM gocardless/stolon-pgbouncer-base:2020050701 AS release
+FROM gocardless/stolon-pgbouncer-base:2022042601 AS release
 COPY --from=build /go/src/github.com/gocardless/stolon-pgbouncer/stolon-pgbouncer /usr/local/bin/stolon-pgbouncer
 USER postgres
 ENTRYPOINT ["/usr/local/bin/stolon-pgbouncer"]

Makefile

@@ -3,9 +3,9 @@ PROJECT=github.com/gocardless/stolon-pgbouncer
 VERSION=$(shell git rev-parse --short HEAD)-dev
 BUILD_COMMAND=go build -ldflags "-X main.Version=$(VERSION)"
 
-BASE_TAG=2020051101
-CIRCLECI_TAG=2020051101
-STOLON_DEVELOPMENT_TAG=2020051101
+BASE_TAG=2022042601
+CIRCLECI_TAG=20220042601
+STOLON_DEVELOPMENT_TAG=2022042601
 
 .PHONY: all darwin linux test clean test-acceptance docker-compose
 

circle.yml

@@ -55,7 +55,8 @@ jobs:
           command: find pkg -type f -name '*.test' -printf "%h %f\n" | xargs -n2 sh -c 'cd $0 && su postgres -c ./$1'
 
   acceptance:
-    machine: true
+    machine:
+      image: ubuntu-2004:202201-02
     working_directory: /home/circleci/stolon-pgbouncer
     steps:
       - checkout

docker-compose.yml

@@ -14,14 +14,14 @@ services:
     volumes:
       - etcd-store-data:/data
     ports:
-      - "2379:2379"
+      - "127.0.0.1:2379:2379"
     networks:
       default:
         aliases:
           - etcd-store
 
   sentinel:
-    image: &stolonDevelopmentImage gocardless/stolon-development:2020050701
+    image: &stolonDevelopmentImage gocardless/stolon-development:2022042601
     restart: on-failure
     depends_on:
       - etcd-store
@@ -41,7 +41,7 @@ services:
     volumes:
       - .:/stolon-pgbouncer
     ports:
-      - "6432:6432"
+      - "127.0.0.1:6432:6432"
     depends_on:
       - keeper0
       - keeper1
@@ -55,9 +55,12 @@ services:
     restart: on-failure
     volumes:
       - keeper0-data:/data
+      - keeper0-wal:/wal
       - .:/stolon-pgbouncer
+    environment:
+      - WAL_DIR=/wal
     ports:
-      - "6433:6432"
+      - "127.0.0.1:6433:6432"
     depends_on:
       - sentinel
 
@@ -69,9 +72,12 @@ services:
     restart: on-failure
     volumes:
       - keeper1-data:/data
+      - keeper1-wal:/wal
       - .:/stolon-pgbouncer
+    environment:
+      - WAL_DIR=/wal
     ports:
-      - "6434:6432"
+      - "127.0.0.1:6434:6432"
     depends_on:
       - sentinel
 
@@ -85,7 +91,7 @@ services:
       - keeper2-data:/data
       - .:/stolon-pgbouncer
     ports:
-      - "6435:6432"
+      - "127.0.0.1:6435:6432"
     depends_on:
       - sentinel
 
@@ -102,7 +108,7 @@ services:
       - '--web.console.templates=/usr/share/prometheus/consoles'
     restart: always
     ports:
-      - 9090:9090
+      - "127.0.0.1:9090:9090"
 
   grafana:
     image: grafana/grafana
@@ -115,7 +121,7 @@ services:
       - grafana-data:/var/lib/grafana
     user: "472"
     ports:
-      - 3000:3000
+      - "127.0.0.1:3000:3000"
     restart: always
 
 # Persist etcd and keeper data across docker restarts. This enables our cluster
@@ -126,6 +132,8 @@ volumes:
   keeper0-data:
   keeper1-data:
   keeper2-data:
+  keeper0-wal:
+  keeper1-wal:
   prometheus-data:
   grafana-data:
 

docker/base/Dockerfile

@@ -1,8 +1,9 @@
-FROM ubuntu:bionic-20200403
+FROM ubuntu:focal-20220302
+ENV DEBIAN_FRONTEND noninteractive
 RUN set -x \
       && apt-get update -y \
       && apt-get install -y curl gpg \
-      && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main\ndeb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg 11" > /etc/apt/sources.list.d/pgdg.list' \
+      && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main\ndeb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg 14" > /etc/apt/sources.list.d/pgdg.list' \
       && curl --silent https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
       && apt-get update -y \
       && apt-get install -y software-properties-common pgbouncer postgresql-client \

docker/circleci/Dockerfile

@@ -1,6 +1,6 @@
 # In addition to our base install of pgbouncer and postgresql-client, add CI
 # dependencies that we require during our builds.
-FROM gocardless/stolon-pgbouncer-base:2020050701
+FROM gocardless/stolon-pgbouncer-base:2022042601
 
 # General test utilities
 RUN set -x \
@@ -12,12 +12,13 @@ RUN set -x \
 ENV GOPATH=/go GOROOT=/usr/local/go PATH=$PATH:/usr/local/go/bin:/go/bin:/usr/sbin
 RUN set -x \
       && mkdir -p /usr/local/go /go \
-      && curl -L https://dl.google.com/go/go1.14.2.linux-amd64.tar.gz -o /tmp/go.tar.gz \
+      && curl -L https://dl.google.com/go/go1.17.linux-amd64.tar.gz -o /tmp/go.tar.gz \
       && tar xfvz /tmp/go.tar.gz -C /usr/local/go --strip-components=1 \
       && go version \
-      && go get -v -u github.com/onsi/ginkgo/ginkgo \
+      && go get -v -u github.com/onsi/ginkgo/v2 \
+      && go install github.com/onsi/ginkgo/v2/ginkgo@latest \
       && ginkgo version \
-      && rm -rv /tmp/go.tar.gz /go/src/github.com/onsi/ginkgo
+      && rm -rv /tmp/go.tar.gz
 
 # We require etcd for our integration tests
 RUN set -x \