From d4f7b59ea0473836af1bbaea20e50afe6f470a46 Mon Sep 17 00:00:00 2001 From: hcornet Date: Sat, 3 Aug 2024 18:33:21 +0200 Subject: [PATCH] update --- Repository/Gitea/.env | 4 ++-- Repository/Gitea/README.md | 2 +- Repository/Gitea/docker-compose-traefik.yml | 16 +++++++++------- Repository/Gitea/prepare.sh | 10 ++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 Repository/Gitea/prepare.sh diff --git a/Repository/Gitea/.env b/Repository/Gitea/.env index b9082dd2..7289c5a4 100644 --- a/Repository/Gitea/.env +++ b/Repository/Gitea/.env @@ -11,8 +11,8 @@ GITEA_ADMIN_USERNAME=giteaadmin GITEA_ADMIN_PASSWORD=P@ssword!Here!123456 GITEA_ADMIN_EMAIL=admin@tips-of-mine.fr GITEA_NOREPLY_EMAIL=noreply@tips-of-mine.fr -GITEA_URL=https://gitea.tips-of-mine.fr -GITEA_HOSTNAME=gitea.tips-of-mine.fr +GITEA_URL=https://gitea.traefik.me +GITEA_HOSTNAME=gitea.traefik.me GITEA_SHELL_SSH_PORT=2222 GITEA_HTTP_PORT=3000 diff --git a/Repository/Gitea/README.md b/Repository/Gitea/README.md index 2d0b21be..69e5af1e 100644 --- a/Repository/Gitea/README.md +++ b/Repository/Gitea/README.md @@ -56,7 +56,7 @@ Pour une utilisation tout seul Pour une utilisation avec Traefik - https://Gitea.10.0.4.29.traefik.me`)" + https://Gitea.traefik.me`)" # More info diff --git a/Repository/Gitea/docker-compose-traefik.yml b/Repository/Gitea/docker-compose-traefik.yml index 90f8127c..89cd3170 100644 --- a/Repository/Gitea/docker-compose-traefik.yml +++ b/Repository/Gitea/docker-compose-traefik.yml @@ -72,7 +72,7 @@ services: postgres: condition: service_healthy healthcheck: - test: ["CMD", "curl", "-f", "http://gitea.tips-of-mine.fr/"] + test: ["CMD", "curl", "-f", "http://gitea.traefik.me/"] interval: 10s timeout: 5s retries: 3 @@ -81,11 +81,12 @@ services: - "traefik.enable=true" - "traefik.docker.network=docker-traefik_front_network" # HTTP - - "traefik.http.routers.gitea-http.rule=Host(`gitea.tips-of-mine.fr`)" - +# - "traefik.http.routers.gitea-http.rule=Host(`gitea.tips-of-mine.fr`)" + - "traefik.http.routers.gitea-http.rule=Host(`gitea.traefik.me`)" - "traefik.http.routers.gitea-http.entrypoints=http" # HTTPS - - "traefik.http.routers.gitea-https.rule=Host(`gitea.tips-of-mine.fr`)" +# - "traefik.http.routers.gitea-https.rule=Host(`gitea.tips-of-mine.fr`)" + - "traefik.http.routers.gitea-https.rule=Host(`gitea.traefik.me`)" - "traefik.http.routers.gitea-https.entrypoints=https" - "traefik.http.routers.gitea-https.tls=true" - "traefik.http.routers.gitea.service=gitea-service" @@ -132,11 +133,12 @@ services: - "traefik.enable=true" - "traefik.docker.network=docker-traefik_front_network" # HTTP - - "traefik.http.routers.adminer-http.rule=Host(`gitea-adminer.tips-of-mine.fr`)" - +# - "traefik.http.routers.adminer-http.rule=Host(`gitea-adminer.tips-of-mine.fr`)" + - "traefik.http.routers.adminer-http.rule=Host(`gitea-adminer.traefik.me`)" - "traefik.http.routers.adminer-http.entrypoints=http" # HTTPS - - "traefik.http.routers.adminer-https.rule=Host(`gitea-adminer.tips-of-mine.fr`)" +# - "traefik.http.routers.adminer-https.rule=Host(`gitea-adminer.tips-of-mine.fr`)" + - "traefik.http.routers.adminer-https.rule=Host(`gitea-adminer.traefik.me`)" - "traefik.http.routers.adminer-https.entrypoints=https" - "traefik.http.routers.adminer-https.tls=true" - "traefik.http.routers.adminer.service=adminer-service" diff --git a/Repository/Gitea/prepare.sh b/Repository/Gitea/prepare.sh new file mode 100644 index 00000000..6dbcf34d --- /dev/null +++ b/Repository/Gitea/prepare.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if ! (docker ps >/dev/null 2>&1) +then + echo "Le daemon docker n'est pas en cours d'exécution, sortie !" + exit +fi + +echo "Préparation de l'init du dossier et création ./init/initdb.sql" +docker run -e GITEA_INSTANCE_URL=https://gitea.traefik.me -e GITEA_RUNNER_REGISTRATION_TOKEN= -v /var/run/docker.sock:/var/run/docker.sock --name my_runner gitea/act_runner:nightly \ No newline at end of file