Merge pull request #620 from dcmcand/dcmcand-remove-extra-redis

remove extra redis and move to using built images for examples
conda-incubator · Oct 16, 2023 · 301bca7 · 301bca7
2 parents 2b6ab87 + d70fd4d
commit 301bca7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/examples/docker-without-nfs/docker-compose.yaml b/examples/docker-without-nfs/docker-compose.yaml
@@ -28,7 +28,7 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   conda-store-worker:
-    build: ../../conda-store-server
+    image: quansight/conda-store-server
     user: 1000:1000
     volumes:
       - conda_store_data:/opt/conda-store/
@@ -48,7 +48,7 @@ services:
       ]
 
   conda-store-server:
-    build: ../../conda-store-server
+    image: quansight/conda-store-server
     user: 1000:1000
     labels:
       - "traefik.enable=true"
@@ -81,7 +81,7 @@ services:
       - "5000:5000"
 
   jupyterhub:
-    build: ../../conda-store
+    build: quansight/conda-store
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.jupyterhub.rule=Host(`conda-store.localhost`) && (Path(`/`) || PathPrefix(`/hub`) || PathPrefix(`/user`))"

diff --git a/examples/docker/docker-compose.yaml b/examples/docker/docker-compose.yaml
@@ -39,7 +39,7 @@ services:
       - conda_store_data:/opt/conda-store/
 
   conda-store-worker:
-    build: ../../conda-store-server
+    image: quansight/conda-store-server
     user: 1000:1000
     volumes:
       - conda_store_data:/opt/conda-store/
@@ -55,7 +55,7 @@ services:
     command: ['conda-store-worker', '--config', '/etc/conda-store/conda_store_config.py']
 
   conda-store-server:
-    build: ../../conda-store-server
+    image: quansight/conda-store-server
     user: 1000:1000
     labels:
       - "traefik.enable=true"
@@ -81,19 +81,8 @@ services:
     ports:
       - "5000:5000"
 
-  redis:
-    image: redis:6.2-alpine
-    restart: always
-    ports:
-      - '6379:6379'
-    command: redis-server --save 20 1 --loglevel debug
-    healthcheck:
-      test: ["CMD", "redis-cli","ping"]
-    volumes:
-      - redis:/etc/redis
-
   jupyterhub:
-    build: ../../conda-store
+    image: quansight/conda-store
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.jupyterhub.rule=Host(`conda-store.localhost`) && (Path(`/`) || PathPrefix(`/hub`) || PathPrefix(`/user`))"