From 31e350679bc42c992bb944eabae33d056e56f162 Mon Sep 17 00:00:00 2001 From: Chris Hubing Date: Thu, 3 Dec 2020 03:33:09 +0000 Subject: [PATCH 1/3] update comanage service to include CSPHOSTNAME --- Workbench/docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index 86d464a..af782ff 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -291,6 +291,11 @@ services: comanage: build: ./comanage/ + args: + - CSPHOSTNAME + environment: + - ENV + - USERTOKEN networks: - net ports: From 2b470c1e363d05e4fa32558f3c9604a4a4888270 Mon Sep 17 00:00:00 2001 From: Chris Hubing Date: Thu, 3 Dec 2020 03:34:06 +0000 Subject: [PATCH 2/3] use CSPHOSTNAME as arg/env or default to localhost --- Workbench/comanage/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile index 9264566..7c82014 100644 --- a/Workbench/comanage/Dockerfile +++ b/Workbench/comanage/Dockerfile @@ -27,7 +27,7 @@ RUN yum -y update && yum -y install --setopt=tsflags=nodocs epel-release python- ARG maintainer=my ARG imagename=comanage ARG version=3.3.1 -ARG CSPHOSTNAME +ARG CSPHOSTNAME=localhost ENV CSPHOSTNAME=$CSPHOSTNAME ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME From 8110e6ddc4575363415680c69ae4099577eda43f Mon Sep 17 00:00:00 2001 From: Chris Hubing Date: Thu, 3 Dec 2020 03:38:49 +0000 Subject: [PATCH 3/3] fix typo --- Workbench/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index af782ff..ff80dcd 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -290,7 +290,8 @@ services: - 443:443 comanage: - build: ./comanage/ + build: + context: ./comanage/ args: - CSPHOSTNAME environment: