From fe2ca059e6c476aee7c5b7e19eb779d7a7191cc2 Mon Sep 17 00:00:00 2001 From: Juergen Weigert Date: Tue, 17 Nov 2020 21:16:27 +0100 Subject: [PATCH 1/2] introduce OCIS_EOS_TAG and BRANCH to better pin a version build from source or a build with an image from docker hub. --- ocis/docker-compose-eos-test.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ocis/docker-compose-eos-test.yml b/ocis/docker-compose-eos-test.yml index 2d1c2a3c2..dfcdba481 100644 --- a/ocis/docker-compose-eos-test.yml +++ b/ocis/docker-compose-eos-test.yml @@ -8,9 +8,11 @@ networks: services: ocis: container_name: ocis - #image: owncloud/eos-ocis:1.0.0-rc2 - build: - context: ./docker/eos-ocis + image: owncloud/eos-ocis:${EOS_OCIS_TAG:-1.0.0-rc5} + #build: + # context: ./docker/eos-ocis + # args: + # BRANCH: ${BRANCH:-v1.0.0-rc5} tty: true privileged: true stdin_open: true From 1ac6cf5489f7e9fea52e390ffab477dacfce679a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Tue, 17 Nov 2020 21:31:05 +0100 Subject: [PATCH 2/2] Usage comments added to docker-compose-eos-test.yml --- ocis/docker-compose-eos-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ocis/docker-compose-eos-test.yml b/ocis/docker-compose-eos-test.yml index dfcdba481..46c63063c 100644 --- a/ocis/docker-compose-eos-test.yml +++ b/ocis/docker-compose-eos-test.yml @@ -8,6 +8,8 @@ networks: services: ocis: container_name: ocis + ## Comment out either the 'build:' section or the 'image:' line. They are mutually exclusive. + ## Using an image is prefered, as this is the published way of building and faster. image: owncloud/eos-ocis:${EOS_OCIS_TAG:-1.0.0-rc5} #build: # context: ./docker/eos-ocis