fix(003_restore_from_backup.sh): ignore script exit 1

Author: duanhongyi

Dockerfile

@@ -7,7 +7,7 @@ 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.4/wal-g.linux-amd64.tar.gz /bin
+ADD https://github.com/wal-g/wal-g/releases/download/v0.2.9/wal-g.linux-amd64.tar.gz /bin
 
 RUN mkdir -p $WALG_ENVDIR \
   && tar -xvzf /bin/wal-g.linux-amd64.tar.gz -C /bin && rm /bin/wal-g.linux-amd64.tar.gz \

contrib/ci/test-minio.sh

@@ -30,7 +30,7 @@ echo "ls /home/minio/*/*/basebackups_005" > "${CURRENT_DIR}"/tmp/bin/backups.sh
 MINIO_JOB=$(docker run -d \
   -v "${CURRENT_DIR}"/tmp/bin:/tmp/bin \
   -v "${CURRENT_DIR}"/tmp/aws-user:/var/run/secrets/drycc/objectstore/creds \
-  quay.io/drycc/minio:canary server /home/minio/)
+  drycc/minio:v1.0.1 server /home/minio/)
 
 # 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 \

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

@@ -1,27 +1,15 @@
 #!/usr/bin/env bash
 
-cat << EOF >> "$PGDATA/postgresql.conf"
-wal_level = archive
-archive_mode = on
-archive_command = 'envdir "${WALG_ENVDIR}" wal-g wal-push %p'
-archive_timeout = 60
-max_connections = 1024
-EOF
-
-# ensure $PGDATA has the right permissions
-chown -R postgres:postgres "$PGDATA"
-chmod 0700 "$PGDATA"
-
-# reboot the server for wal_level to be set before backing up
-echo "Rebooting postgres to enable archive mode"
-su-exec postgres pg_ctl -D "$PGDATA" -w restart
-
 # check if there are any backups -- if so, let's restore
 # we could probably do better than just testing number of lines -- one line is just a heading, meaning no backups
 
 if [[ $(envdir "$WALG_ENVDIR" wal-g backup-list | wc -l) -gt "1" ]]; then
   echo "Found backups. Restoring from backup..."
-  su-exec postgres pg_ctl -D "$PGDATA" -w stop
+  {
+    su-exec postgres pg_ctl -D "$PGDATA" -w stop > /dev/null 2>&1
+  } || {
+    echo "ignore script errors"
+  }
   rm -rf "$PGDATA"
   envdir "$WALG_ENVDIR" wal-g backup-fetch "$PGDATA" LATEST
   cat << EOF > "$PGDATA/postgresql.conf"
@@ -56,6 +44,22 @@ EOF
   su-exec postgres pg_ctl -D "$PGDATA" \
       -o "-c listen_addresses=''" \
       -w start
+else
+  cat << EOF >> "$PGDATA/postgresql.conf"
+wal_level = archive
+archive_mode = on
+archive_command = 'envdir "${WALG_ENVDIR}" wal-g wal-push %p'
+archive_timeout = 60
+max_connections = 1024
+EOF
+
+  # ensure $PGDATA has the right permissions
+  chown -R postgres:postgres "$PGDATA"
+  chmod 0700 "$PGDATA"
+
+  # reboot the server for wal_level to be set before backing up
+  echo "Rebooting postgres to enable archive mode"
+  su-exec postgres pg_ctl -D "$PGDATA" -w restart
 fi
 
 # ensure $PGDATA has the right permissions