Merge branch 'master' into ustutt

OpenTOSCA · Mar 22, 2021 · f53b41f · f53b41f
2 parents 54fc719 + 3c67f86
commit f53b41f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -41,6 +41,8 @@ ENV WINERY_FEATURE_UPDATE_TEMPLATES false
 ENV DOCKERIZE_VERSION v0.6.1
 ENV CHE_URL "che.localhost"
 ENV CHE_URL_PROTOCOL "http"
+ENV GITHUB_CLIENT_ID ""
+ENV GITHUB_CLIENT_SECRET ""
 
 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/winery.yml.tpl b/docker/winery.yml.tpl
@@ -26,8 +26,8 @@ repository:
   repositoryRoot: {{ .Env.WINERY_REPOSITORY_PATH }}
   csarOutputPath: {{ .Env.WINERY_CSAR_OUTPUT_PATH }}
   git:
-    clientSecret: secret
+    clientSecret: {{ .Env.GITHUB_CLIENT_SECRET }}
     password: default
-    clientID: id
+    clientID: {{ .Env.GITHUB_CLIENT_ID }}
     autocommit: false
     username: default