From 893c4d9ad94e1a1058eeae08e34ab29b0da71619 Mon Sep 17 00:00:00 2001
From: bwalkow <bwalkow@e-science.pl>
Date: Mon, 25 Sep 2023 10:09:11 +0200
Subject: [PATCH] Change backend address
---
.gitlab-ci.yml | 6 ++++--
httpd.conf | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5963360..9e6d0a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,9 @@ build_image:
services:
- docker:18.09.7-dind
script:
- - docker build -t $CI_REGISTRY_IMAGE .
+ - if [ "$CI_COMMIT_REF_NAME" == "master" ]; then TAG="latest"; else TAG="develop"; fi
+ - docker build -t $CI_REGISTRY_IMAGE:$TAG .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker push $CI_REGISTRY_IMAGE
+ - docker push $CI_REGISTRY_IMAGE:$TAG
+
diff --git a/httpd.conf b/httpd.conf
index 4f04ee4..11190d7 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
</IfModule>
ProxyPreserveHost On
-ProxyPass /lexp/ http://lexp_service:8080/lex/
-ProxyPassReverse /lexp/ http://lexp_service:8080/lex/
\ No newline at end of file
+ProxyPass /lexp/ http://lexpservice:80/lex/
+ProxyPassReverse /lexp/ http://lexpservice:80/lex/
\ No newline at end of file
--
GitLab