diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 3aaf7965c3cc07e7f2daf626c7330cddc531d9a2..a549aabdf4de16144bfa6f98456c31971aa53ba0 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -1,9 +1,7 @@ -version: '3' +version: '3.2' services: hub: image: ${CI_REGISTRY_IMAGE}/api:${CI_COMMIT_SHA} - cache_from: ${CI_REGISTRY_IMAGE}/api:latest webserver: image: ${CI_REGISTRY_IMAGE}/webserver:${CI_COMMIT_SHA} - cache_from: ${CI_REGISTRY_IMAGE}/webserver:latest diff --git a/docker-compose.yml b/docker-compose.yml index 2b05c976d420179c090a9e7f9f8c802df92034ed..14d1d68c491c12448d3749bebe95d51c663f5ae9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3' +version: '3.2' services: hub: @@ -6,6 +6,8 @@ services: build: context: uhepp_org dockerfile: Dockerfile + cache_from: + - ${CI_REGISTRY_IMAGE}/api:latest environment: SUPER_USERNAME: ${SUPER_USERNAME} SUPER_EMAIL: ${SUPER_EMAIL} @@ -25,6 +27,8 @@ services: build: context: nginx dockerfile: Dockerfile + cache_from: + - ${CI_REGISTRY_IMAGE}/webserver:latest ports: - "80:80" volumes: