From 8d5256fba7b4e0f61321f513ca6d6bc5e9ae3d31 Mon Sep 17 00:00:00 2001 From: Calvin McLean Date: Tue, 4 Jun 2019 10:24:11 -0700 Subject: [PATCH 1/2] Add volumes to enable Chromogenic/virt-sysprep --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 56bc9f0..4fe125e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,8 @@ services: - '../atmosphere:/opt/dev/atmosphere' - '../atmosphere-ansible:/opt/dev/atmosphere-ansible' - '../atmosphere-docker-secrets:/opt/dev/atmosphere-docker-secrets' + - '/boot:/boot' + - '/lib/modules:/lib/modules' depends_on: - 'postgres' From b90936635ce82f756f528fde6b4ed2c0b7026eef Mon Sep 17 00:00:00 2001 From: Calvin McLean Date: Thu, 6 Jun 2019 09:36:27 -0700 Subject: [PATCH 2/2] Use CyVerse Dockerhub images --- docker-compose.atmo-test.yml | 2 +- docker-compose.test.yml | 4 ++-- docker-compose.tropo-test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.atmo-test.yml b/docker-compose.atmo-test.yml index 0a10169..316f86a 100644 --- a/docker-compose.atmo-test.yml +++ b/docker-compose.atmo-test.yml @@ -10,7 +10,7 @@ services: POSTGRES_PASSWORD: 'atmosphere_db_pass' atmosphere: - image: 'calvinmclean/atmosphere:latest' + image: 'cyverse/atmosphere:latest' entrypoint: '/root/test.sh' depends_on: - 'postgres' diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2c11794..677c501 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -13,12 +13,12 @@ services: TROPO_DB_NAME: 'troposphere' atmosphere: - image: 'calvinmclean/atmosphere:latest' + image: 'cyverse/atmosphere:latest' depends_on: - 'postgres' troposphere: - image: 'calvinmclean/troposphere:latest' + image: 'cyverse/troposphere:latest' depends_on: - 'atmosphere' ports: diff --git a/docker-compose.tropo-test.yml b/docker-compose.tropo-test.yml index 79de5ef..58fb052 100644 --- a/docker-compose.tropo-test.yml +++ b/docker-compose.tropo-test.yml @@ -11,7 +11,7 @@ services: POSTGRES_DB: 'troposphere_db' troposphere: - image: 'calvinmclean/troposphere:latest' + image: 'cyverse/troposphere:latest' entrypoint: '/root/test.sh' depends_on: - 'postgres'