Merge pull request #370 from FNNDSC/change-storebase

Change storebase
FNNDSC · Mar 11, 2022 · f8afacb · f8afacb
2 parents a4dd08c + ee8618a
commit f8afacb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/kubernetes/prod/base/resources/pfcon.yaml b/kubernetes/prod/base/resources/pfcon.yaml
@@ -54,7 +54,7 @@ spec:
                 name: pfcon-config
           volumeMounts:
             - name: storebase
-              mountPath: "/home/localuser/storeBase"
+              mountPath: "/var/local/storeBase"
       # Mount a persistent volume onto pfcon's key store (shared data volume with plugins)
       volumes:
         - name: storebase

diff --git a/kubernetes/remote.yaml b/kubernetes/remote.yaml
@@ -54,7 +54,7 @@ spec:
           command: ["gunicorn"]
           args: ["-w", "5", "-b", "0.0.0.0:30005", "-t",  "200", "pfcon.wsgi:application"]
           volumeMounts:
-            - mountPath: "/home/localuser/storeBase"
+            - mountPath: "/var/local/storeBase"
               name: "store-base"
       # We need to mount a physical dir in the HOST onto the key store in pfcon. This dir
       # is given by the STOREBASE env variable substitution.

diff --git a/swarm/docker-compose_remote.yml b/swarm/docker-compose_remote.yml
@@ -16,11 +16,11 @@ version: '3.7'
 services:
 
   pfcon:
-    image: fnndsc/pfcon
+    image: ${PFCON_IMAGE-fnndsc/pfcon}
     # We need to mount a physical dir in the HOST onto the key store in pfcon. This dir
     # is given by the STOREBASE env variable.
     volumes:
-      - ${STOREBASE:?}:/home/localuser/storeBase:z
+      - ${STOREBASE:?}:/var/local/storeBase:z
     ports:
       - "30005:30005"
     command: ["gunicorn", "-w", "5", "-b", "0.0.0.0:30005", "-t",  "200", "pfcon.wsgi:application"]
@@ -48,7 +48,7 @@ services:
       - STOREBASE
       - SECRET_KEY="w1kxu^l=@pnsf!5piqz6!!5kdcdpo79y6jebbp+2244yjm*#+k"
       - CONTAINER_ENV=swarm
-    image: fnndsc/pman
+    image: ${PMAN_IMAGE-fnndsc/pman}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:z
     deploy:

diff --git a/swarm/prod/docker-compose.yml b/swarm/prod/docker-compose.yml
@@ -221,7 +221,7 @@ services:
     # We need to mount a physical dir in the HOST onto the key store in pfcon. This dir
     # is given by the STOREBASE env variable.
     volumes:
-      - ${STOREBASE:?}:/home/localuser/storeBase
+      - ${STOREBASE:?}:/var/local/storeBase
     ports:
       - "5005:5005"
     depends_on: