ds/test
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: ds/test:main
Branches Tags
ds/test:main ds/test:web1.cloud.dev.osnawiki.de
..
pull from: ds/test:web1.cloud.dev.osnawiki.de
Branches Tags
ds/test:main ds/test:web1.cloud.dev.osnawiki.de

7 Commits
main .. web1.cloud.dev.osnawiki.de

Author SHA1 Message Date
ds bc35c5b219 .env aktualisiert 2025-12-20 04:11:07 +00:00
ds 4edcacb3a2 docker-compose.yml aktualisiert 2025-12-20 04:10:27 +00:00
ds 57ead42847 docker-compose.yml aktualisiert 2025-12-20 04:08:36 +00:00
ds 8acbcc9d30 Merge pull request '.env hinzugefügt' (#1) from main into web1.cloud.dev.osnawiki.de 
Reviewed-on: #1
 2025-12-20 04:06:26 +00:00
ds 402cd048dc docker-compose.yml aktualisiert 2025-12-20 04:02:53 +00:00
ds 4aa948898a docker-compose.yml aktualisiert 2025-12-20 03:36:58 +00:00
ds 034ea47dd1 docker-compose.yml aktualisiert 2025-12-20 03:34:28 +00:00
5 changed files with 10 additions and 10 deletions
Expand all files Collapse all files
.env
+1
View File
@@ -1,2 +1,3 @@
APP_URL=http://web1.cloud.dev.osnawiki.de APP_URL=http://web1.cloud.dev.osnawiki.de
VIRTUAL_HTTP_PORT=8041
HTTP_PORT=80 HTTP_PORT=80
Dockerfile
+1 -1
View File
@@ -1,3 +1,3 @@
FROM nginx FROM nginx
COPY ./index.html /usr/share/nginx/html/index.html COPY . /usr/share/nginx/html
Jenkinsfile
Vendored
+2 -2
View File
@@ -19,7 +19,7 @@
def imageName = "registry.dev.osnawiki.de/${env.Repo.replace('https://gitea.dev.osnawiki.de/','').replaceFirst('/','#').replaceAll('/','').replace('#','-')}:${env.Branch.toLowerCase()}-${env.BUILD_NUMBER}" def imageName = "registry.dev.osnawiki.de/${env.Repo.replace('https://gitea.dev.osnawiki.de/','').replaceFirst('/','#').replaceAll('/','').replace('#','-')}:${env.Branch.toLowerCase()}-${env.BUILD_NUMBER}"
imageName = imageName.replace('--','-') imageName = imageName.replace('--','-')
echo "Baue Image ${imageName}" echo "Baue Image ${imageName}"
customImage = docker.build(imageName) //customImage = docker.build(imageName)
} }
} }
} }
@@ -28,7 +28,7 @@
steps { steps {
script { script {
withDockerRegistry(credentialsId: 'registrycredentials', url: "https://registry.dev.osnawiki.de") { withDockerRegistry(credentialsId: 'registrycredentials', url: "https://registry.dev.osnawiki.de") {
customImage.push("latest") //customImage.push("latest")
} }
} }
} }
docker-compose.yml
+4 -4
View File
@@ -1,8 +1,8 @@
services: services:
web: web:
image: registry.dev.osnawiki.de/ds-test:latest image: registry.dev.osnawiki.de/ds-test:web1.cloud.dev.osnawiki.de-72
ports: ports:
- "127.0.0.1:${HTTP_PORT}:80" - "127.0.0.1:${VIRTUAL_HTTP_PORT}:${HTTP_PORT}"
labels: labels:
caddy: build.dev.osnawiki.de caddy: http://${APP_URL}
caddy.reverse_proxy: "{{upstreams 80}}" caddy.reverse_proxy: "{{upstreams ${HTTP_PORT}}}"
index.html
+2 -3
View File
@@ -4,12 +4,11 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>ds test jenkins build</title> <title>HTML 5 template</title>
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
</head> </head>
<body> <body>
nur index.html im image<br> impressum
update4
<script src="index.js"></script> <script src="index.js"></script>
</body> </body>
</html> </html>