chore(postgres): upgrade to pg13

Author: duanhongyi

Dockerfile

@@ -1,22 +1,25 @@
-FROM minio/mc:RELEASE.2019-05-23T01-33-27Z as mc
+FROM minio/mc:RELEASE.2020-07-17T02-52-20Z as mc
 
-FROM postgres:11-alpine
+FROM postgres:13-alpine
 
 COPY rootfs /
 COPY --from=mc /usr/bin/mc /bin/mc
 
 ENV PGDATA $PGDATA/$PG_MAJOR
 ENV WALG_ENVDIR /etc/wal-g.d/env
-ADD https://github.com/wal-g/wal-g/releases/download/v0.2.9/wal-g.linux-amd64.tar.gz /bin
+ADD https://github.com/wal-g/wal-g/releases/download/v0.2.16/wal-g.linux-amd64.tar.gz /bin
 
-RUN mkdir -p $WALG_ENVDIR \
+RUN sed -i s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g /etc/apk/repositories \
+  && mkdir -p $WALG_ENVDIR \
   && tar -xvzf /bin/wal-g.linux-amd64.tar.gz -C /bin && rm /bin/wal-g.linux-amd64.tar.gz \
-  && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk \
-    && apk add --allow-untrusted glibc-2.28-r0.apk \
-    && rm glibc-2.28-r0.apk \
-  && apk add --no-cache jq python3 \
-  && pip3 install --upgrade pip setuptools \
-  && pip install envdir
+  && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.31-r0/glibc-2.31-r0.apk \
+    && apk add --allow-untrusted glibc-2.31-r0.apk \
+    && rm glibc-2.31-r0.apk \
+  && apk add --no-cache jq python3 curl \
+  && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
+  && python3 get-pip.py \
+  && rm -rf get-pip.py \
+  && pip3 install envdir
 
 CMD ["/docker-entrypoint.sh", "postgres"]
 EXPOSE 5432

Makefile

@@ -12,7 +12,7 @@ SHELL_SCRIPTS = $(wildcard _scripts/*.sh contrib/ci/*.sh rootfs/bin/*)
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/drycc/go-dev:v0.22.0
+DEV_ENV_IMAGE := drycc/go-dev
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}

README.md

@@ -2,7 +2,6 @@
 # Drycc Postgres
 
 [![Build Status](https://travis-ci.org/drycc/postgres.svg?branch=master)](https://travis-ci.org/drycc/postgres)
-[![Docker Repository on Quay](https://quay.io/repository/drycc/postgres/status "Docker Repository on Quay")](https://quay.io/repository/drycc/postgres)
 
 Drycc (pronounced DAY-iss) Workflow is an open source Platform as a Service (PaaS) that adds a developer-friendly layer to any [Kubernetes](http://kubernetes.io) cluster, making it easy to deploy and manage applications on your own servers.
 
@@ -47,15 +46,15 @@ This project has a [Makefile](https://github.com/drycc/postgres/blob/master/Make
 
 * `DRYCC_REGISTRY` - A Docker registry that you have push access to and your Kubernetes cluster can pull from
   * If this is [Docker Hub](https://hub.docker.com/), leave this variable empty
-  * Otherwise, ensure it has a trailing `/`. For example, if you're using [Quay.io](https://quay.io), use `quay.io/`
+  * Otherwise, ensure it has a trailing `/`
 * `IMAGE_PREFIX` - The organization in the Docker repository. This defaults to `drycc`, but if you don't have access to that organization, set this to one you have push access to.
 * `SHORT_NAME` (optional) - The name of the image. This defaults to `postgres`
 * `VERSION` (optional) - The tag of the Docker image. This defaults to the current Git SHA (the output of `git rev-parse --short HEAD`)
 
-Assuming you have these variables set correctly, run `make docker-build` to build the new image, and `make docker-push` to push it. Here is an example command that would push to `quay.io/arschles/postgres:devel`:
+Assuming you have these variables set correctly, run `make docker-build` to build the new image, and `make docker-push` to push it. Here is an example command that would push to `example.com/arschles/postgres:devel`:
 
 ```console
-export DRYCC_REGISTRY=quay.io/
+export DRYCC_REGISTRY=example.com/
 export IMAGE_PREFIX=arschles
 export VERSION=devel
 make docker-build docker-push

contrib/ci/test-minio.sh

@@ -32,6 +32,10 @@ MINIO_JOB=$(docker run -d \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
   drycc/minio:v1.0.1 server /home/minio/)
 
+
+puts-step "minio starting, wait 30s."
+sleep 30
+
 # boot postgres, linking the minio container and setting DRYCC_MINIO_SERVICE_HOST and DRYCC_MINIO_SERVICE_PORT
 PG_CMD="docker run -d --link ${MINIO_JOB}:minio -e PGCTLTIMEOUT=1200 \
   -e BACKUP_FREQUENCY=1s -e DATABASE_STORAGE=minio \

rootfs/bin/create_bucket

@@ -3,6 +3,6 @@
 # shellcheck disable=SC1091
 source /bin/normalize_storage
 has_bucket=$(mc ls minio -json|jq -r '.key'|grep -w "${MINIO_BUCKET}")
-if  [ ! -n "$has_bucket" ] ;then
+if  [ -z "$has_bucket" ] ;then
     mc mb minio/"${MINIO_BUCKET}"
 fi

rootfs/bin/do_backup

@@ -3,7 +3,7 @@
 export BACKUPS_TO_RETAIN=${BACKUPS_TO_RETAIN:-5}
 
 echo "Performing a base backup..."
-if [[ -f "$PGDATA/recovery.conf" ]] ; then
+if [[ -f "$PGDATA/recovery.signal" ]] ; then
     echo "Database is currently recovering from a backup. Aborting"
     sleep 9
 else

rootfs/bin/is_running

@@ -3,7 +3,7 @@
 # fail fast
 set -e
 
-if [[ -f "$PGDATA/recovery.conf" ]]; then
+if [[ -f "$PGDATA/recovery.signal" ]]; then
   # postgres is in recovery mode, so we know it's not ready to accept incoming connections.
   exit 1
 fi

rootfs/docker-entrypoint-initdb.d/003_restore_from_backup.sh

@@ -26,6 +26,7 @@ archive_command = 'envdir "${WALG_ENVDIR}" wal-g wal-push %p'
 archive_timeout = 60
 listen_addresses = '*'
 max_connections = 1024
+restore_command = 'envdir "${WALG_ENVDIR}" wal-g wal-fetch \"%f\" \"%p\"'
 EOF
   cat << EOF > "$PGDATA/pg_hba.conf"
 # "local" is for Unix domain socket connections only
@@ -38,7 +39,7 @@ host    all             all             ::1/128                 trust
 host    all             all             0.0.0.0/0               md5
 EOF
   touch "$PGDATA/pg_ident.conf"
-  echo "restore_command = 'envdir "${WALG_ENVDIR}" wal-g wal-fetch \"%f\" \"%p\"'" >> "$PGDATA/recovery.conf"
+  touch "$PGDATA/recovery.signal"
   chown -R postgres:postgres "$PGDATA"
   chmod 0700 "$PGDATA"
   su-exec postgres pg_ctl -D "$PGDATA" \