Add possibility to change URL scheme

Signed-off-by: Michael Wurster <miwurster@googlemail.com>
winery · Sep 16, 2020 · e70831c · e70831c
1 parent 316afeb
commit e70831c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,6 +38,8 @@ ENV WINERY_FEATURE_SPLITTING false
 ENV WINERY_FEATURE_TEST_REFINEMENT false
 ENV WINERY_FEATURE_EDMM_MODELING false
 ENV DOCKERIZE_VERSION v0.6.1
+ENV CHE_URL "che.localhost"
+ENV CHE_URL_PROTOCOL "http://"
 
 RUN rm /dev/random && ln -s /dev/urandom /dev/random \
     && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \

diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
@@ -7,7 +7,6 @@ if [ -z "${CHE_API}" ]; then
     export CHE_URL=$cheUrl
 fi
 
-
 mkdir -p .winery
 dockerize -template winery.yml.tpl:.winery/winery.yml
 if [ -d "${WINERY_REPOSITORY_PATH}" ] && [ "$(ls -A ${WINERY_REPOSITORY_PATH})" ]; then

diff --git a/docker/winery.yml.tpl b/docker/winery.yml.tpl
@@ -19,7 +19,7 @@ ui:
     repositoryApiUrl: http://{{ .Env.WINERY_HOSTNAME }}:{{ .Env.WINERY_PORT }}/winery
     repositoryUiUrl: http://{{ .Env.WINERY_HOSTNAME }}:{{ .Env.WINERY_PORT }}/#
     edmmTransformationTool: http://{{ .Env.EDMM_TRANSFORMATION_HOSTNAME }}:{{ .Env.EDMM_TRANSFORMATION_PORT }}/plugins/check-model-support
-    eclipseChe: http://{{ .Env.CHE_URL }}
+    eclipseChe: {{ .Env.CHE_URL_PROTOCOL }}://{{ .Env.CHE_URL }}
 repository:
   provider: {{ .Env.WINERY_REPOSITORY_PROVIDER }}
   repositoryRoot: {{ .Env.WINERY_REPOSITORY_PATH }}