Skip to content

Commit

Permalink
Switch to specific tags for every container
Browse files Browse the repository at this point in the history
  • Loading branch information
cjh1 committed Mar 6, 2020
1 parent 04c115e commit a0049c9
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/avogadro/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: '2'
services:
avogadro:
image: openchemistry/avogadro:latest
image: openchemistry/avogadro:1.0
ports:
- 5001:5000
2 changes: 1 addition & 1 deletion docker/dev/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
version: '2'
services:
mongo:
image: mongo:latest
image: mongo:4.2.3

volumes:
- mongo:/data/db
ports:
Expand All @@ -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
Expand All @@ -35,7 +36,7 @@ services:

gridengine:
privileged: true
image: openchemistry/gridengine
image: openchemistry/gridengine:1.0
build:
context: gridengine
dockerfile: Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions docker/girder/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -12,18 +12,18 @@ 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'
volumes:
- 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'
Expand Down
2 changes: 1 addition & 1 deletion docker/jena/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docker/jupyterhub/.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/jupyterhub/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: "2"

services:
hub-db:
image: postgres:latest
image: postgres:9.6.17
container_name: jupyterhub-db
restart: always
environment:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/openbabel/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
services:
openbabel:
image: openchemistry/openbabel:latest
image: openchemistry/openbabel:1.0

0 comments on commit a0049c9

Please sign in to comment.