From 585a92130493b5c552cab274786cdfb51e5c2602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=B6nig?= <Alexander.Koenig@eurac.edu>
Date: Tue, 7 Aug 2018 11:47:01 +0200
Subject: [PATCH] some small fixes to release.sh and default-ssl
---
dockerfiles/commul-customization/default-ssl | 4 ++--
dockerfiles/release.sh | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dockerfiles/commul-customization/default-ssl b/dockerfiles/commul-customization/default-ssl
index df36d0a..d9c4168 100644
--- a/dockerfiles/commul-customization/default-ssl
+++ b/dockerfiles/commul-customization/default-ssl
@@ -89,8 +89,8 @@ server {
location /php/aa-statistics.php {
shib_request /shibauthorizer;
- include proxy_params;
- proxy_pass http://apache;
+# include proxy_params;
+ proxy_pass http://localhost:8080;
}
location /repository {
diff --git a/dockerfiles/release.sh b/dockerfiles/release.sh
index edb77fb..6c2669e 100755
--- a/dockerfiles/release.sh
+++ b/dockerfiles/release.sh
@@ -4,11 +4,11 @@ set -e
VERSION=${1:-latest}
TYPE=${2:-staging}
-docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/dspace:$VERSION . -f Dockerfile.dspace
-docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/nginx:$VERSION . -f Dockerfile.nginx
-docker build -t gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/postgres:$VERSION . -f Dockerfile.postgres
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/dspace:$VERSION . -f Dockerfile.dspace
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/nginx:$VERSION . -f Dockerfile.nginx
+docker build -t gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/postgres:$VERSION . -f Dockerfile.postgres
-docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/dspace:$VERSION
-docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/nginx:$VERSION
-docker push gitlab.inf.unibz.it:4567/commul/docker/dspace/$TYPE/postgres:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/dspace:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/nginx:$VERSION
+docker push gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/$TYPE/postgres:$VERSION
--
GitLab