diff --git a/Dockerfiles/db/Dockerfile b/Dockerfiles/db/Dockerfile index f7e3a4bb96ac28f7803fc56d2ff52e25d9ec29d4..5cfb8daa41f17ffdaca8335438ffc909fe87a745 100644 --- a/Dockerfiles/db/Dockerfile +++ b/Dockerfiles/db/Dockerfile @@ -5,6 +5,14 @@ FROM postgis/postgis:11-3.3-alpine # Arguments ARG NAMESPACE_ENV +ARG PGDATA="/arb-data/pgdata" +ARG HTTP_PROXY="" + +ENV HTTP_PROXY=$HTTP_PROXY +ENV HTTPS_PROXY=$HTTP_PROXY +###--------------- LOCAL BUILD ONLY -------------------- +# ENV POSTGRES_HOST_AUTH_METHOD=trust +###--------------- /LOCAL BUILD ONLY -------------------- USER root @@ -12,6 +20,7 @@ ENV PGDATA=/arb-data/pgdata RUN mkdir -p $PGDATA && \ chown -R postgres:0 /$PGDATA && \ chmod 777 /$PGDATA +# chmod -R g+rwx /$PGDATA ?? a tester ?? # Entry point. COPY ./db-init/ /docker-entrypoint-initdb.d/ diff --git a/deployment/pods/pvc-calqul.yml b/deployment/pods/pvc-calqul.yml index b560a4881d37ff1386437a3a299bee536b2effaf..104e99170bd617f1e2e9c5fd381b7a8b1520c8d3 100644 --- a/deployment/pods/pvc-calqul.yml +++ b/deployment/pods/pvc-calqul.yml @@ -25,11 +25,13 @@ spec: containers: - name: calqul-pvc-__NAMESPACE_ENV__ image: registry.gitlab.grandlyon.fr/openshift-as-code/reposit-gl/busybox:1.0 - command: ["sh", "-c", "watch -n 30 df -h /mnt/data"] + command: ["sh", "-c", "watch -n 30 df -h | grep /mnt/data"] imagePullPolicy: Always volumeMounts: - mountPath: /mnt/data name: data + - mountPath: /mnt/data2 + name: data2 resources: requests: memory: "32M" @@ -40,4 +42,8 @@ spec: volumes: - name: data persistentVolumeClaim: - claimName: pvc-03-__NAMESPACE__-claim \ No newline at end of file + claimName: pvc-02-__NAMESPACE__-claim + - name: data2 + persistentVolumeClaim: + claimName: pvc-03-__NAMESPACE__-claim + \ No newline at end of file