From cd961180ae6f6053be4f2a184327df07a6ed3cdf Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 9 Aug 2024 16:24:43 +0200
Subject: [PATCH] ozg-6277 caddyfile
---
Jenkinsfile | 8 ++++++--
alfa-client/apps/alfa/Caddyfile | 6 ++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 54f805cd54..f2dec8dd87 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,8 +94,12 @@ pipeline {
sh 'npm run ci-build-alfa-client-container'
- sh "docker tag docker.ozg-sh.de/alfa-client:build-latest docker.ozg-sh.de/alfa-client:${IMAGE_TAG}"
- sh "docker push docker.ozg-sh.de/alfa-client:${IMAGE_TAG}"
+ withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
+ sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
+
+ sh "docker tag docker.ozg-sh.de/alfa-client:build-latest docker.ozg-sh.de/alfa-client:${IMAGE_TAG}"
+ sh "docker push docker.ozg-sh.de/alfa-client:${IMAGE_TAG}"
+ }
}
}
}
diff --git a/alfa-client/apps/alfa/Caddyfile b/alfa-client/apps/alfa/Caddyfile
index 1b04b1fe06..440e32b476 100644
--- a/alfa-client/apps/alfa/Caddyfile
+++ b/alfa-client/apps/alfa/Caddyfile
@@ -1,8 +1,6 @@
:8080 {
file_server
root * /usr/share/caddy
-}
-:8081 {
- respond "Hello, world! Test"
-}
+ try_files {path} /index.html
+}
\ No newline at end of file
--
GitLab