Gitea update + add Runner

Repository/Gitea/.env

@@ -1,8 +1,31 @@
-GITEA_VERSION=latest
+# Postgre Variables
-GITEA_HOSTNAME=localhost
+POSTGRES_IMAGE_TAG=postgres:15.6-alpine
-GITEA_WEB_PORT=3000
+POSTGRE_DB_NAME=gitea_db
-GITEA_SSH_PORT=2222
+POSTGRE_DB_USER=gitea_user
-MYSQL_ROOT_PASSWORD=root
+POSTGRE_DB_PASSWORD=P@ssword!Here!123456
-MYSQL_DATABASE=gitea
+POSTGRE_DB_DATA=/var/lib/postgresql/data/gitea
-MYSQL_USER=gitea
+
-MYSQL_PASSWORD=gitea
+# Gitea Variables
+GITEA_IMAGE_TAG=gitea/gitea:latest
+GITEA_ADMIN_USERNAME=giteaadmin
+GITEA_ADMIN_PASSWORD=P@ssword!Here!123456
+GITEA_ADMIN_EMAIL=admin@saint-maclou.com
+GITEA_NOREPLY_EMAIL=noreply@saint-maclou.com
+GITEA_URL=https://gitea.fr.dgs.group
+GITEA_HOSTNAME=gitea.fr.dgs.group
+GITEA_SHELL_SSH_PORT=2222
+GITEA_HTTP_PORT=3000
+
+# Adminer Variables
+ADMINER_IMAGE_TAG=adminer:latest
+
+# Backup Variables
+BACKUP_INIT_SLEEP=30m
+BACKUP_INTERVAL=24h
+POSTGRES_BACKUP_PRUNE_DAYS=7
+DATA_BACKUP_PRUNE_DAYS=7
+POSTGRES_BACKUPS_PATH=/srv/gitea-postgres/backups
+DATA_BACKUPS_PATH=/srv/gitea-application-data/backups
+DATA_PATH=/bitnami/gitea
+POSTGRES_BACKUP_NAME=gitea-postgres-backup
+DATA_BACKUP_NAME=gitea-application-data-backup

Repository/Gitea/docker-compose-traefik.yml

@@ -1,66 +1,202 @@
-![Fichier-Stockage](./img/logo-Fichier-Stockage.png)
+#### NETWORKS
-URL : HHHHH
+networks:
+  docker-traefik_front_network:
+    external: true
+  back_network:
+    driver: bridge
+    attachable: true
 
-# Fichier-Stockage 
+#### SERVICES
+services:
+  gitea:
+    container_name: gitea-app
+    hostname: gitea-app
+    image: ${GITEA_IMAGE_TAG}
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=postgres:5432
+      - GITEA__database__NAME=${POSTGRE_DB_NAME}
+      - GITEA__database__USER=${POSTGRE_DB_USER}
+      - GITEA__database__PASSWD=${POSTGRE_DB_PASSWORD}
+      - GITEA__database__LOG_SQL=true
+      - GITEA__database__SCHEMA=public
+      - GITEA__database__SSL_MODE=disable
+      - GITEA__mailer__ENABLED=true
+      - GITEA__mailer__FROM=gitea@saint-maclou.com
+      - GITEA__mailer__PROTOCOL=smtps
+      - GITEA__mailer__SMTP_ADDR=relaissmtp.fr.dgs.group
+      - GITEA__mailer__SMTP_PORT=25
+      - GITEA__mailer__USER=
+      - GITEA__mailer__PASSWD=
+      - GITEA__admin__USER=${GITEA_ADMIN_USERNAME}
+      - GITEA__admin__PASSWORD=${GITEA_ADMIN_PASSWORD}
+      - GITEA__admin__EMAIL=${GITEA_ADMIN_EMAIL}
+      - GITEA__server__DOMAIN=${GITEA_HOSTNAME}
+      - GITEA__server__SSH_DOMAIN=${GITEA_HOSTNAME}
+      - GITEA__server__ROOT_URL=${GITEA_URL}
+      - GITEA__server__HTTP_PORT=${GITEA_HTTP_PORT}
+      - GITEA__server__SSH_PORT=${GITEA_SHELL_SSH_PORT}
+      - GITEA__server__SSH_LISTEN_PORT=22
+      - GITEA__actions__ENABLED=true
+      - GITEA__metrics__ENABLED=true
+      - GITEA__metrics__ENABLED_ISSUE_BY_REPOSITORY=true
+      - GITEA__metrics__ENABLED_ISSUE_BY_LABEL=true
+      - GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__service__REQUIRE_SIGNIN_VIEW=true
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__ENABLE_NOTIFY_MAIL=true
+      - GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION=false
+      - GITEA__service__ENABLE_CAPTCHA=true
+      - GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE=false
+      - GITEA__service__DEFAULT_ALLOW_CREATE_ORGANIZATION=true
+      - GITEA__service__DEFAULT_ENABLE_TIMETRACKING=true
+      - GITEA__service__NO_REPLY_ADDRESS=${GITEA_NOREPLY_EMAIL}
+      - GITEA__RUN_MODE=prod
+      - GITEA__APP_NAME=Gitea for me
+    restart: always
+    networks:
+      - back_network
+      - docker-traefik_front_network
+    volumes:
+      - ./gitea:/data:rw
+      - ./custom:/app/gitea/custom:rw
+      - ./log:/app/gitea/log:rw
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3080:3000"
+      - "3222:22"
+    depends_on:
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://gitea.fr.dgs.group/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=docker-traefik_front_network"
+# HTTP
+      - "traefik.http.routers.gitea-http.rule=Host(`gitea.fr.dgs.group`)"
 
-GGGGG
+      - "traefik.http.routers.gitea-http.entrypoints=http"
+# HTTPS
+      - "traefik.http.routers.gitea-https.rule=Host(`gitea.fr.dgs.group`)"
+      - "traefik.http.routers.gitea-https.entrypoints=https"
+      - "traefik.http.routers.gitea-https.tls=true"
+      - "traefik.http.routers.gitea.service=gitea-service"
+# Middleware
+# Service
+      - "traefik.http.services.gitea-service.loadbalancer.server.port=3000"
 
-# Téléchargement, Configuration et Lancement
+### postgres
+  postgres:
+    container_name: gitea-postgres
+    hostname: gitea-postgres
+    image: ${POSTGRES_IMAGE_TAG}
+    environment:
+      PGDATA: ${POSTGRE_DB_DATA}
+      POSTGRES_DB: ${POSTGRE_DB_NAME}
+      POSTGRES_PASSWORD: ${POSTGRE_DB_PASSWORD}
+      POSTGRES_USER: ${POSTGRE_DB_USER}
+      TZ: Europe/Paris
+    restart: unless-stopped
+    networks:
+      - back_network
+    volumes:
+      - ./data:/var/lib/postgresql/data:rw
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "${POSTGRE_DB_NAME}", "-U", "${POSTGRE_DB_USER}" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
 
-## Téléchargement de Fichier-Stockage
+### adminer
+  adminer:
+    container_name: gitea-adminer
+    hostname: gitea-adminer
+    image: ${ADMINER_IMAGE_TAG}
+    restart: always
+    networks:
+    - back_network
+    - docker-traefik_front_network
+    depends_on:
+      postgres:
+        condition: service_healthy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=docker-traefik_front_network"
+# HTTP
+      - "traefik.http.routers.adminer-http.rule=Host(`gitea-adminer.fr.dgs.group`)"
 
-Saisir la commande pour télécharger la source
+      - "traefik.http.routers.adminer-http.entrypoints=http"
-```bash
+# HTTPS
-git clone https://git.tips-of-mine.fr/Tips-Of-Mine/Docker.git
+      - "traefik.http.routers.adminer-https.rule=Host(`gitea-adminer.fr.dgs.group`)"
-```
+      - "traefik.http.routers.adminer-https.entrypoints=https"
+      - "traefik.http.routers.adminer-https.tls=true"
+      - "traefik.http.routers.adminer.service=adminer-service"
+# Middleware
+# Service
+      - "traefik.http.services.adminer-service.loadbalancer.server.port=8080"
+      
+### backups
+  backups:
+    container_name: gitea-postgres-backup
+    hostname: gitea-postgres-backup
+    image: ${POSTGRES_IMAGE_TAG}
+    command: >-
+      sh -c 'sleep $BACKUP_INIT_SLEEP &&
+      while true; do
+        pg_dump -h postgres -p 5432 -d $POSTGRE_DB_NAME -U $POSTGRE_DB_USER | gzip > $POSTGRES_BACKUPS_PATH/$POSTGRES_BACKUP_NAME-$(date "+%Y-%m-%d_%H-%M").gz &&
+        tar -zcpf $DATA_BACKUPS_PATH/$DATA_BACKUP_NAME-$(date "+%Y-%m-%d_%H-%M").tar.gz $DATA_PATH &&
+        find $POSTGRES_BACKUPS_PATH -type f -mtime +$POSTGRES_BACKUP_PRUNE_DAYS | xargs rm -f &&
+        find $DATA_BACKUPS_PATH -type f -mtime +$DATA_BACKUP_PRUNE_DAYS | xargs rm -f;
+        sleep $BACKUP_INTERVAL; done'
+    environment:
+      GITEA_DB_NAME: ${POSTGRE_DB_NAME}
+      GITEA_DB_USER: ${POSTGRE_DB_USER}
+      PGPASSWORD: ${POSTGRE_DB_PASSWORD}
+      BACKUP_INIT_SLEEP: ${BACKUP_INIT_SLEEP}
+      BACKUP_INTERVAL: ${BACKUP_INTERVAL}
+      POSTGRES_BACKUP_PRUNE_DAYS: ${POSTGRES_BACKUP_PRUNE_DAYS}
+      DATA_BACKUP_PRUNE_DAYS: ${DATA_BACKUP_PRUNE_DAYS}
+      POSTGRES_BACKUPS_PATH: ${POSTGRES_BACKUPS_PATH}
+      DATA_BACKUPS_PATH: ${DATA_BACKUPS_PATH}
+      DATA_PATH: ${DATA_PATH}
+      POSTGRES_BACKUP_NAME: ${POSTGRES_BACKUP_NAME}
+      DATA_BACKUP_NAME: ${DATA_BACKUP_NAME}
+    restart: unless-stopped
+    networks:
+      - back_network
+    volumes:
+      - ./backup/data:/var/lib/postgresql/data
+      - ./backup/gitea:${DATA_PATH}
+      - ./backup/backups:${DATA_BACKUPS_PATH}
+      - ./backup/database:${POSTGRES_BACKUPS_PATH}
+    depends_on:
+      postgres:
+        condition: service_healthy
 
-Saisir la commande pour vous rendre dans le dossier
+### runner
-```bash
+  runner:
-cd AAAAA\Fichier-Stockage
+    container_name: gitea-runner
-```
+    hostname: gitea-runner
-
+    image: gitea/act_runner:latest
-## Modifier la configuration de Fichier-Stockage
+    environment:
-
+      - GITEA_INSTANCE_URL=${GITEA_HOSTNAME}
-Saisir la commande pour vous rendre dans le dossier
+      - GITEA_RUNNER_REGISTRATION_TOKEN=8CZ3Sd2VHITGIA1Xr2bo5j8l5Pj1EvTblTCeDmJU
-```bash
+    restart: unless-stopped
-cd AAAAA\Fichier-Stockage
+    networks:
-```
+      - back_network
-
+    volumes:
-Nous éditons le fichier de configuration
+      - ./data-runner/act_runner:/data
-```bash
+      - /var/run/docker.sock:/var/run/docker.sock
-nano .env
+    privileged: true
-```
+    depends_on:
-
+      gitea:
-Nous modifions les variables dont nous avons besoin.
+        condition: service_healthy
-
-## Lancement de Fichier-Stockage
-
-Pour utiliser Fichier-Stockage tout seul
-```bash
-docker compose up -d
-```
-
-Pour utiliser Fichier-Stockage avec Traefik
-```bash
-docker compose -f docker-compose-traefik.yml up -d
-```
-
-# Utilisation
-
-## Accueil
-
-Ouvrir une page web avec l'url :
-Pour une utilisation tout seul
-
-	http://10.0.4.29:3000
-
-Pour une utilisation avec Traefik
-
-	https://Fichier-Stockage.10.0.4.29.traefik.me`)"
-
-
-# More info
-- more information on the website [Tips-Of-Mine](https://www.tips-of-mine.fr/)
-
-# Buy me a coffe
-<a href='https://ko-fi.com/R5R2KNI3N' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi4.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>

Repository/Gitea/docker-compose.yaml

@@ -1,59 +0,0 @@
-#### NETWORKS
-networks:
-  docker-traefik_front_network:
-    external: true
-  back_network:
-    driver: bridge
-    attachable: true
-
-#### SERVICES
-services:
-
-### gitea
-  gitea:
-    container_name: gitea-app
-    hostname: gitea-app
-    image: gitea/gitea:${GITEA_VERSION}
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=db:5432
-      - GITEA__database__NAME=gitea
-      - GITEA__database__USER=gitea
-      - GITEA__database__PASSWD=gitea
-    restart: always
-    volumes:
-      - ./gitea:/data
-    depends_on:
-      - postgres
-    networks:
-      - back_network
-      - docker-traefik_front_network
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.gitea-secure.entrypoints=https"
-      - "traefik.http.routers.gitea-secure.rule=Host(`gitea.jimsgarage.co.uk`)"
-      - "traefik.http.routers.gitea-secure.tls=true"
-      - "traefik.http.routers.gitea-secure.service=gitea@docker"
-      - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-      - "traefik.docker.network=proxy"
-    security_opt:
-      - no-new-privileges:true
-
-### postgres
-  postgres:
-    container_name: gitea-postgres
-    hostname: gitea-postgres
-    image: postgres:14
-    restart: always
-    environment:
-      PGDATA: /var/lib/postgresql/data/gitea
-      POSTGRES_DB: gitea_db
-      POSTGRES_PASSWORD: 'P@ssword!Here!123456'
-      POSTGRES_USER: gitea_user
-      TZ: Europe/Paris
-    volumes:
-      - ./postgres:/var/lib/postgresql/data
-    networks:
-      - back_network

Repository/Gitea/docker-compose.yml

@@ -1,8 +1,172 @@
 #### NETWORKS
 networks:
+  docker-traefik_front_network:
+    external: true
   back_network:
     driver: bridge
     attachable: true
 
 #### SERVICES
 services:
+  gitea:
+    container_name: gitea-app
+    hostname: gitea-app
+    image: ${GITEA_IMAGE_TAG}
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=postgres:5432
+      - GITEA__database__NAME=${POSTGRE_DB_NAME}
+      - GITEA__database__USER=${POSTGRE_DB_USER}
+      - GITEA__database__PASSWD=${POSTGRE_DB_PASSWORD}
+      - GITEA__database__LOG_SQL=true
+      - GITEA__database__SCHEMA=public
+      - GITEA__database__SSL_MODE=disable
+      - GITEA__mailer__ENABLED=true
+      - GITEA__mailer__FROM=gitea@saint-maclou.com
+      - GITEA__mailer__PROTOCOL=smtps
+      - GITEA__mailer__SMTP_ADDR=relaissmtp.fr.dgs.group
+      - GITEA__mailer__SMTP_PORT=25
+      - GITEA__mailer__USER=
+      - GITEA__mailer__PASSWD=
+      - GITEA__admin__USER=${GITEA_ADMIN_USERNAME}
+      - GITEA__admin__PASSWORD=${GITEA_ADMIN_PASSWORD}
+      - GITEA__admin__EMAIL=${GITEA_ADMIN_EMAIL}
+      - GITEA__server__DOMAIN=${GITEA_HOSTNAME}
+      - GITEA__server__SSH_DOMAIN=${GITEA_HOSTNAME}
+      - GITEA__server__ROOT_URL=${GITEA_URL}
+      - GITEA__server__HTTP_PORT=${GITEA_HTTP_PORT}
+      - GITEA__server__SSH_PORT=${GITEA_SHELL_SSH_PORT}
+      - GITEA__server__SSH_LISTEN_PORT=22
+      - GITEA__actions__ENABLED=true
+      - GITEA__metrics__ENABLED=true
+      - GITEA__metrics__ENABLED_ISSUE_BY_REPOSITORY=true
+      - GITEA__metrics__ENABLED_ISSUE_BY_LABEL=true
+      - GITEA__service__DISABLE_REGISTRATION=false
+      - GITEA__service__REQUIRE_SIGNIN_VIEW=true
+      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
+      - GITEA__service__ENABLE_NOTIFY_MAIL=true
+      - GITEA__service__ALLOW_ONLY_EXTERNAL_REGISTRATION=false
+      - GITEA__service__ENABLE_CAPTCHA=true
+      - GITEA__service__DEFAULT_KEEP_EMAIL_PRIVATE=false
+      - GITEA__service__DEFAULT_ALLOW_CREATE_ORGANIZATION=true
+      - GITEA__service__DEFAULT_ENABLE_TIMETRACKING=true
+      - GITEA__service__NO_REPLY_ADDRESS=${GITEA_NOREPLY_EMAIL}
+      - GITEA__RUN_MODE=prod
+      - GITEA__APP_NAME=Gitea for me
+    restart: always
+    networks:
+      - back_network
+      - docker-traefik_front_network
+    volumes:
+      - ./gitea:/data:rw
+      - ./custom:/app/gitea/custom:rw
+      - ./log:/app/gitea/log:rw
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    ports:
+      - "3080:3000"
+      - "3222:22"
+    depends_on:
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://gitea.fr.dgs.group/"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 90s
+
+### postgres
+  postgres:
+    container_name: gitea-postgres
+    hostname: gitea-postgres
+    image: ${POSTGRES_IMAGE_TAG}
+    environment:
+      PGDATA: ${POSTGRE_DB_DATA}
+      POSTGRES_DB: ${POSTGRE_DB_NAME}
+      POSTGRES_PASSWORD: ${POSTGRE_DB_PASSWORD}
+      POSTGRES_USER: ${POSTGRE_DB_USER}
+      TZ: Europe/Paris
+    restart: unless-stopped
+    networks:
+      - back_network
+    volumes:
+      - ./data:/var/lib/postgresql/data:rw
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-q", "-d", "${POSTGRE_DB_NAME}", "-U", "${POSTGRE_DB_USER}" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+      start_period: 60s
+
+### adminer
+  adminer:
+    container_name: gitea-adminer
+    hostname: gitea-adminer
+    image: ${ADMINER_IMAGE_TAG}
+    restart: always
+    networks:
+    - back_network
+    - docker-traefik_front_network
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+### backups
+  backups:
+    container_name: gitea-postgres-backup
+    hostname: gitea-postgres-backup
+    image: ${POSTGRES_IMAGE_TAG}
+    command: >-
+      sh -c 'sleep $BACKUP_INIT_SLEEP &&
+      while true; do
+        pg_dump -h postgres -p 5432 -d $POSTGRE_DB_NAME -U $POSTGRE_DB_USER | gzip > $POSTGRES_BACKUPS_PATH/$POSTGRES_BACKUP_NAME-$(date "+%Y-%m-%d_%H-%M").gz &&
+        tar -zcpf $DATA_BACKUPS_PATH/$DATA_BACKUP_NAME-$(date "+%Y-%m-%d_%H-%M").tar.gz $DATA_PATH &&
+        find $POSTGRES_BACKUPS_PATH -type f -mtime +$POSTGRES_BACKUP_PRUNE_DAYS | xargs rm -f &&
+        find $DATA_BACKUPS_PATH -type f -mtime +$DATA_BACKUP_PRUNE_DAYS | xargs rm -f;
+        sleep $BACKUP_INTERVAL; done'
+    environment:
+      GITEA_DB_NAME: ${POSTGRE_DB_NAME}
+      GITEA_DB_USER: ${POSTGRE_DB_USER}
+      PGPASSWORD: ${POSTGRE_DB_PASSWORD}
+      BACKUP_INIT_SLEEP: ${BACKUP_INIT_SLEEP}
+      BACKUP_INTERVAL: ${BACKUP_INTERVAL}
+      POSTGRES_BACKUP_PRUNE_DAYS: ${POSTGRES_BACKUP_PRUNE_DAYS}
+      DATA_BACKUP_PRUNE_DAYS: ${DATA_BACKUP_PRUNE_DAYS}
+      POSTGRES_BACKUPS_PATH: ${POSTGRES_BACKUPS_PATH}
+      DATA_BACKUPS_PATH: ${DATA_BACKUPS_PATH}
+      DATA_PATH: ${DATA_PATH}
+      POSTGRES_BACKUP_NAME: ${POSTGRES_BACKUP_NAME}
+      DATA_BACKUP_NAME: ${DATA_BACKUP_NAME}
+    restart: unless-stopped
+    networks:
+      - back_network
+    volumes:
+      - ./backup/data:/var/lib/postgresql/data
+      - ./backup/gitea:${DATA_PATH}
+      - ./backup/backups:${DATA_BACKUPS_PATH}
+      - ./backup/database:${POSTGRES_BACKUPS_PATH}
+    depends_on:
+      postgres:
+        condition: service_healthy
+
+### runner
+  runner:
+    container_name: gitea-runner
+    hostname: gitea-runner
+    image: gitea/act_runner:latest
+    environment:
+      - GITEA_INSTANCE_URL=${GITEA_HOSTNAME}
+      - GITEA_RUNNER_REGISTRATION_TOKEN=8CZ3Sd2VHITGIA1Xr2bo5j8l5Pj1EvTblTCeDmJU
+    restart: unless-stopped
+    networks:
+      - back_network
+    volumes:
+      - ./data-runner/act_runner:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    privileged: true
+    depends_on:
+      gitea:
+        condition: service_healthy