fix(database): premission denied

Author: duanhongyi

Dockerfile

@@ -1,8 +1,5 @@
 FROM docker.io/drycc/base:bullseye
 
-ENV PGDATA /opt/drycc/postgresql/14/data
-ENV WALG_ENVDIR /etc/wal-g.d/env
-
 COPY rootfs/bin /bin/
 COPY rootfs/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d/
 COPY rootfs/docker-entrypoint.sh /docker-entrypoint.sh
@@ -11,8 +8,13 @@ ENV JQ_VERSION="1.6" \
   MC_VERSION="2022.02.26.03.58.31" \
   WAL_G_VERSION="1.1" \
   PYTHON_VERSION="3.10.2" \
+  PG_MAJOR=14 \
   POSTGRESQL_VERSION="14.2"
 
+
+ENV PGDATA /data/${PG_MAJOR}
+ENV WALG_ENVDIR /etc/wal-g.d/env
+
 RUN mkdir -p $WALG_ENVDIR \
   && install-stack jq $JQ_VERSION \
   && install-stack gosu $GOSU_VERSION \

charts/database/templates/database-deployment.yaml

@@ -24,7 +24,7 @@ spec:
       - name: drycc-database-init
         image: docker.io/drycc/python-dev:latest
         imagePullPolicy: {{.Values.imagePullPolicy}}
-        command:
+        args:
           - netcat
           - -v
           - -a
@@ -60,12 +60,14 @@ spec:
             preStop:
               exec:
                 command:
+                  - init-stack
                   - gosu
                   - postgres
                   - do_backup
           readinessProbe:
             exec:
               command:
+                - init-stack
                 - is_running
             initialDelaySeconds: 30
             timeoutSeconds: 1
@@ -76,7 +78,7 @@ spec:
               mountPath: /var/run/secrets/drycc/objectstore/creds
             {{- if .Values.persistence.enabled }}
             - name: database-data
-              mountPath: /var/lib/postgresql
+              mountPath: /data
             {{- end }}
       volumes:
         {{- if .Values.persistence.enabled }}

contrib/ci/test-minio.sh

@@ -26,13 +26,12 @@ echo "1234567890123456789012345678901234567890" > "${CURRENT_DIR}"/tmp/aws-user/
 
 # boot minio
 mkdir -p "${CURRENT_DIR}"/tmp/bin
-echo "ls /data/*/basebackups_005" > "${CURRENT_DIR}"/tmp/bin/backups.sh
+echo "ls /data/database-bucket/*/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 \
   drycc/minio:canary server /data/)
 
-
 puts-step "minio starting, wait 30s."
 sleep 30
 
@@ -55,6 +54,7 @@ check-postgres "${PG_JOB}"
 # check if minio has the 5 backups
 puts-step "checking if minio has 5 backups"
 BACKUPS="$(docker exec "${MINIO_JOB}" sh /tmp/bin/backups.sh | grep json)"
+
 NUM_BACKUPS="$(echo "${BACKUPS}" | wc -w)"
 # NOTE (bacongobbler): the BACKUP_FREQUENCY is only 1 second, so we could technically be checking
 # in the middle of a backup. Instead of failing, let's consider N+1 backups an acceptable case