From a0049c96105e6fe18d088322582b01047b00d1e4 Mon Sep 17 00:00:00 2001 From: Chris Harris Date: Fri, 6 Mar 2020 14:00:54 -0500 Subject: [PATCH] Switch to specific tags for every container --- cli.py | 2 +- docker/avogadro/docker-compose.yml | 2 +- docker/dev/.env | 2 +- docker/dev/docker-compose.yml | 9 +++++---- docker/girder/docker-compose.yml | 8 ++++---- docker/jena/docker-compose.yml | 2 +- docker/jupyterhub/.env | 2 +- docker/jupyterhub/docker-compose.yml | 4 ++-- docker/openbabel/docker-compose.yml | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/cli.py b/cli.py index 6cf234c..bb202b7 100644 --- a/cli.py +++ b/cli.py @@ -88,7 +88,7 @@ def _execute_command(subcommand, args): def _pull_extra_images(): """Pull extra images that docker-compose will not pull.""" cmd = ["docker", "pull"] - extra_images = ["openchemistry/jupyterlab"] + extra_images = ["openchemistry/jupyterlab:1.0"] cmd += extra_images p = None try: diff --git a/docker/avogadro/docker-compose.yml b/docker/avogadro/docker-compose.yml index d40597e..6289659 100644 --- a/docker/avogadro/docker-compose.yml +++ b/docker/avogadro/docker-compose.yml @@ -1,6 +1,6 @@ version: '2' services: avogadro: - image: openchemistry/avogadro:latest + image: openchemistry/avogadro:1.0 ports: - 5001:5000 diff --git a/docker/dev/.env b/docker/dev/.env index 21b1528..8e9cc70 100644 --- a/docker/dev/.env +++ b/docker/dev/.env @@ -2,7 +2,7 @@ MONGODB_URL=mongodb://mongo/girder RABBITMQ_URL=amqp://guest:guest@rabbitmq:5672/ DOCKER_MACHINE_NAME=jupyterhub DOCKER_NETWORK_NAME=dev_default -DOCKER_NOTEBOOK_IMAGE=openchemistry/jupyterlab:latest +DOCKER_NOTEBOOK_IMAGE=openchemistry/jupyterlab:1.0 DOCKER_NOTEBOOK_DIR=/home/jovyan/work DOCKER_SPAWN_CMD=start-singleuser.sh DATA_VOLUME_HOST=jupyterhub-data diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index bdcf913..a8d0a47 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,7 +1,8 @@ version: '2' services: mongo: - image: mongo:latest + image: mongo:4.2.3 + volumes: - mongo:/data/db ports: @@ -21,10 +22,10 @@ services: client: - image: openchemistry/mongochemclient:latest + image: openchemistry/mongochemclient:1.0 ansible: - image: openchemistry/ansible + image: openchemistry/ansible:1.0 build: context: . dockerfile: ansible/Dockerfile @@ -35,7 +36,7 @@ services: gridengine: privileged: true - image: openchemistry/gridengine + image: openchemistry/gridengine:1.0 build: context: gridengine dockerfile: Dockerfile diff --git a/docker/girder/docker-compose.yml b/docker/girder/docker-compose.yml index e773843..62ed55a 100644 --- a/docker/girder/docker-compose.yml +++ b/docker/girder/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: girder: - image: openchemistry/mongochemserver:latest + image: openchemistry/mongochemserver:1.0 command: -d ${MONGODB_URL} ${GIRDER_EXTRA_ARGS} depends_on: - 'mongo' @@ -12,10 +12,10 @@ services: - 127.0.0.1:8080:8080 rabbitmq: - image: rabbitmq + image: rabbitmq:3.8.2 celery_command: - image: openchemistry/celery_worker:latest + image: openchemistry/celery_worker:1.0 command: celery worker --app=cumulus -b ${RABBITMQ_URL} -n command --config=cumulus.celery.commandconfig --loglevel=INFO depends_on: - 'rabbitmq' @@ -23,7 +23,7 @@ services: - keys:/keys celery_monitor: - image: openchemistry/celery_worker:latest + image: openchemistry/celery_worker:1.0 command: celery worker --app=cumulus -b ${RABBITMQ_URL} -n monitor -Q monitor --config=cumulus.celery.monitorconfig --loglevel=INFO depends_on: - 'rabbitmq' diff --git a/docker/jena/docker-compose.yml b/docker/jena/docker-compose.yml index 8df7634..9862a9b 100644 --- a/docker/jena/docker-compose.yml +++ b/docker/jena/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: jena-fuseki: - image: stain/jena-fuseki:latest + image: stain/jena-fuseki:3.13.1 volumes: - jena-fuseki-data:/fuseki ports: diff --git a/docker/jupyterhub/.env b/docker/jupyterhub/.env index 23d851e..25f7049 100644 --- a/docker/jupyterhub/.env +++ b/docker/jupyterhub/.env @@ -15,7 +15,7 @@ DOCKER_MACHINE_NAME=jupyterhub DOCKER_NETWORK_NAME=jupyterhub_default # Single-user Jupyter Notebook server container image -DOCKER_NOTEBOOK_IMAGE=openchemistry/jupyterlab:latest +DOCKER_NOTEBOOK_IMAGE=openchemistry/jupyterlab:1.0 # Notebook directory in the container. # This will be /home/jovyan/work if the default diff --git a/docker/jupyterhub/docker-compose.yml b/docker/jupyterhub/docker-compose.yml index f6a308d..8790b2e 100644 --- a/docker/jupyterhub/docker-compose.yml +++ b/docker/jupyterhub/docker-compose.yml @@ -9,7 +9,7 @@ version: "2" services: hub-db: - image: postgres:latest + image: postgres:9.6.17 container_name: jupyterhub-db restart: always environment: @@ -27,7 +27,7 @@ services: build: context: ${JUPYTERHUB_DOCKER_DIR} dockerfile: Dockerfile.jupyterhub - image: openchemistry/jupyterhub:oc + image: openchemistry/jupyterhub:1.0 container_name: jupyterhub volumes: # Bind Docker socket on the host so we can connect to the daemon from diff --git a/docker/openbabel/docker-compose.yml b/docker/openbabel/docker-compose.yml index 8651874..9aa28e7 100644 --- a/docker/openbabel/docker-compose.yml +++ b/docker/openbabel/docker-compose.yml @@ -1,4 +1,4 @@ version: '2' services: openbabel: - image: openchemistry/openbabel:latest + image: openchemistry/openbabel:1.0