Merge pull request #77 from cybertec-postgresql/pgbackrest

Pgbackrest

Author: Schmaetz

Makefile

@@ -134,7 +134,7 @@ postgres-oracle-build:
 postgres-oracle: postgres-oracle-build
 
 pgbouncer-build:
-		docker build $(ROOTPATH)														\
+		docker build $(ROOTPATH)	--no-cache											\
 			--file $(ROOTPATH)/docker/pgbouncer/Dockerfile 								\
 			--tag cybertec-pg-container/pgbouncer:$(IMAGE_TAG)							\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)										\

docker/pgbackrest/Dockerfile

@@ -131,6 +131,9 @@ COPY --from=micro / /
 
 ARG PGVERSION
 
+ENV PATH=$PATH:/usr/pgsql-$PGVERSION/bin \
+	LD_LIBRARY_PATH=/usr/pgsql-$PGVERSION/lib:$LD_LIBRARY_PATH
+
 LABEL org.opencontainers.image.source=https://github.com/cybertec-postgresql/CYBERTEC-pg-container
 LABEL org.opencontainers.image.description="CYBERTEC-PG-Container - pgBackRest-Container for restore-Container and as Repo-Host"
 LABEL org.opencontainers.image.licenses=Apache-2.0

launcher/postgres/launch.sh

@@ -18,11 +18,11 @@ fi
 sysctl -w vm.dirty_background_bytes=67108864 > /dev/null 2>&1
 sysctl -w vm.dirty_bytes=134217728 > /dev/null 2>&1
 mkdir -p "$PGLOG" "$PGDATA" "$RW_DIR/postgresql" "$RW_DIR/tmp" "$RW_DIR/certs"
-if [ "$(id -u)" -ne 0 ]; then
-    sed -e "s/^postgres:x:[^:]*:[^:]*:/postgres:x:$(id -u):$(id -g):/" /etc/passwd > "$RW_DIR/tmp/passwd"
-    cat "$RW_DIR/tmp/passwd" > /etc/passwd
-    rm "$RW_DIR/tmp/passwd"
-fi
+# if [ "$(id -u)" -ne 0 ]; then
+#     sed -e "s/^postgres:x:[^:]*:[^:]*:/postgres:x:$(id -u):$(id -g):/" /etc/passwd > "$RW_DIR/tmp/passwd"
+#     cat "$RW_DIR/tmp/passwd" > /etc/passwd
+#     rm "$RW_DIR/tmp/passwd"
+# fi
 
 ## Ensure all logfiles exist, most appliances will have
 ## a foreign data wrapper pointing to these files

scripts/pgbackrest/repo-host/start.sh

@@ -16,13 +16,33 @@ status=$(echo $stanza | jq '.[0].status.code')
 
 if [ "$db" == "[]" ] && [ "$archive" == "[]" ] || [ "$status" == "1" ]; then
     # Check if Primary is ready
-    pgbackrest stanza-create --stanza=db
+        count=0
+        while true
+        do
+            pgbackrest stanza-create --stanza=db
+            returnCode=$?
+            ((count++))
+
+            if [ "$returnCode" -eq 56 ]; then
+                echo "WARNING: pgbackrest could not create stanza – No primary found - Attempt $count / 10"
+                sleep 5
+            elif [ "$returnCode" -eq 0 ]; then
+                echo "INFO: pgbackrest stanza successfully created."
+                break
+            fi
+
+            if [ "$count" -eq 10 ]; then
+                echo "ERROR: pgbackrest could not create stanza - reached max attempts."
+                break
+            fi
+        done
+    echo "INFO: create initial backup"
     pgbackrest backup --type=full --stanza=db --repo=1
-    echo "Finished: pgBackRest is ready for use"
+    echo "INFO: pgBackRest is ready for use"
 else
     backupCount=$(pgbackrest info --output=json | jq '.[0].backup'| jq length)
     if [ "$backupCount" == "0" ]; then
         pgbackrest backup --type=full --stanza=db --repo=1
-        echo "Finished: pgBackRest is ready for use"
+        echo "INFO: pgBackRest is ready for use"
     fi
 fi