From 760fda758d374dd19a9cc307d056f2c70e3b8bb2 Mon Sep 17 00:00:00 2001
From: Frank Sauerburger <frank@sauerburger.com>
Date: Wed, 13 Jan 2021 15:54:35 +0100
Subject: [PATCH] Fix cache_from option
---
docker-compose.ci.yml | 4 +---
docker-compose.yml | 6 +++++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 3aaf796..a549aab 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 2b05c97..14d1d68 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:
--
GitLab