Compare commits

..

85 commits

Author SHA1 Message Date
9a3029bb77 Update postgres Docker tag to v17 2025-02-23 13:44:46 +00:00
Ada
0254246352 Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.9.0' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-02-21 16:12:02 +01:00
c17a178e72 Update gitlab/gitlab-ce Docker tag to v17.9.0 2025-02-20 13:28:05 +00:00
Ada
e4037e808a Merge pull request 'Update semaphoreui/semaphore Docker tag to v2.12.14' () from renovate/semaphoreui-semaphore-2.x into main
Reviewed-on: 
2025-02-15 16:58:25 +01:00
Ada
a0299a877a Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.170.2' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-02-15 16:57:38 +01:00
7e3041f7cc Update ghcr.io/renovatebot/renovate Docker tag to v39.170.2 2025-02-15 07:46:34 +00:00
7e87d0e4e0 Update semaphoreui/semaphore Docker tag to v2.12.14 2025-02-14 22:33:39 +00:00
Ada
eac8c33833 Merge pull request 'Update semaphoreui/semaphore Docker tag to v2.12.12' () from renovate/semaphoreui-semaphore-2.x into main
Reviewed-on: 
2025-02-14 20:53:59 +01:00
Ada
80915e0959 Merge pull request 'Update vaultwarden/server Docker tag to v1.33.2' () from renovate/vaultwarden-server-1.x into main
Reviewed-on: 
2025-02-14 20:53:50 +01:00
Ada
cdb9681c3e Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.8.2' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-02-14 20:53:28 +01:00
Ada
3986eaefe5 Merge pull request 'Update woodpeckerci/woodpecker-server Docker tag to v3.1.0' () from renovate/woodpeckerci-woodpecker-server-3.x into main
Reviewed-on: 
2025-02-14 20:53:10 +01:00
efb5998fdc Update semaphoreui/semaphore Docker tag to v2.12.12 2025-02-14 13:49:05 +00:00
1ae24a408f Update woodpeckerci/woodpecker-server Docker tag to v3.1.0 2025-02-13 14:48:23 +00:00
48ca0d0c9e Update gitlab/gitlab-ce Docker tag to v17.8.2 2025-02-12 09:38:09 +00:00
8c00972731 Update vaultwarden/server Docker tag to v1.33.2 2025-02-09 17:59:38 +00:00
Ada
16b4aa5b1e Merge pull request 'Update codeberg.org/forgejo/forgejo Docker tag to v10.0.1' () from renovate/codeberg.org-forgejo-forgejo-10.x into main
Reviewed-on: 
2025-02-09 13:27:31 +01:00
60cb231f97 Merge pull request 'dev/outout/fix_ci' () from dev/outout/fix_ci into main
Reviewed-on: 
2025-02-08 16:57:19 +01:00
e51621fe98 Update codeberg.org/forgejo/forgejo Docker tag to v10.0.1 2025-02-08 13:49:34 +00:00
Ada
99afc04309 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.159.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-02-04 21:20:52 +01:00
Ada
5951260f56 Merge pull request 'Update ghcr.io/requarks/wiki Docker tag to v2.5.306' () from renovate/ghcr.io-requarks-wiki-2.x into main
Reviewed-on: 
2025-02-04 21:20:49 +01:00
Ada
d56fb3c174 Merge pull request 'Update semaphoreui/semaphore Docker tag to v2.12.4' () from renovate/semaphoreui-semaphore-2.x into main
Reviewed-on: 
2025-02-04 21:20:42 +01:00
Ada
f5da5ecdf0 Merge pull request 'Update vaultwarden/server Docker tag to v1.33.1' () from renovate/vaultwarden-server-1.x into main
Reviewed-on: 
2025-02-04 21:20:27 +01:00
e576fb0801 Update ghcr.io/renovatebot/renovate Docker tag to v39.159.0 2025-02-04 12:56:33 +00:00
33b553f87e Update vaultwarden/server Docker tag to v1.33.1 2025-02-03 13:32:42 +00:00
2d140808ff Update semaphoreui/semaphore Docker tag to v2.12.4 2025-02-03 07:26:04 +00:00
6ac144a04d Update ghcr.io/requarks/wiki Docker tag to v2.5.306 2025-02-02 23:09:23 +00:00
bf55560ffb Merge branch 'main' into dev/outout/fix_ci 2025-02-02 16:43:09 +01:00
27cebc8f4c Merge pull request 'Update vaultwarden/server Docker tag to v1.33.0' () from renovate/vaultwarden-server-1.x into main
Reviewed-on: 
2025-02-02 16:42:12 +01:00
0bc67480a4 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.156.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-02-02 16:42:05 +01:00
726a26e0e8 Merge pull request 'Update mcuadros/ofelia Docker tag to v3' () from renovate/mcuadros-ofelia-3.x into main
Reviewed-on: 
2025-02-02 16:41:50 +01:00
3968bc629e Merge pull request 'Update semaphoreui/semaphore Docker tag to v2.12.3' () from renovate/semaphoreui-semaphore-2.x into main
Reviewed-on: 
2025-02-02 16:41:42 +01:00
10c244917b Merge branch 'main' of ssh://git.gnous.eu:2222/enpls/docker-services 2025-02-02 16:41:17 +01:00
719970caa2 fix agent on internals 2025-02-02 16:40:35 +01:00
a25a9dd44c Update ghcr.io/renovatebot/renovate Docker tag to v39.156.0 2025-02-01 10:52:28 +00:00
869c1511af Update semaphoreui/semaphore Docker tag to v2.12.3 2025-01-29 15:46:43 +00:00
677d38a854 Update vaultwarden/server Docker tag to v1.33.0 2025-01-25 12:53:34 +00:00
Ada
3effe11ff6 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.133.3' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-24 23:14:41 +01:00
Ada
8df5b83f7f Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.8.1' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-01-24 23:14:37 +01:00
c52631e246 Update ghcr.io/renovatebot/renovate Docker tag to v39.133.3 2025-01-24 20:57:14 +00:00
61387dd545 Update gitlab/gitlab-ce Docker tag to v17.8.1 2025-01-22 14:30:48 +00:00
Ada
fac79e87ae Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.120.2' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-21 19:49:19 +01:00
Ada
bf9e076439 Merge pull request 'Update woodpeckerci/woodpecker-server Docker tag to v3.0.1' () from renovate/woodpeckerci-woodpecker-server-3.x into main
Reviewed-on: 
2025-01-21 19:49:09 +01:00
a3b7ccb31b Update ghcr.io/renovatebot/renovate Docker tag to v39.120.2 2025-01-21 18:15:38 +00:00
2133d5111b Update woodpeckerci/woodpecker-server Docker tag to v3.0.1 2025-01-20 16:06:56 +00:00
Ada
e5f9ddb713 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.117.2' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-19 22:37:47 +01:00
Ada
6a9bd0f23b Merge pull request 'Update woodpeckerci/woodpecker-server Docker tag to v3' () from renovate/woodpeckerci-woodpecker-server-3.x into main
Reviewed-on: 
2025-01-19 22:37:38 +01:00
35377aa6b1 Update ghcr.io/renovatebot/renovate Docker tag to v39.117.2 2025-01-19 14:08:49 +00:00
2af53ff081 Update woodpeckerci/woodpecker-server Docker tag to v3 2025-01-18 21:12:52 +00:00
Ada
7dd106949d Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.115.2' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-17 19:11:40 +01:00
Ada
f897019a0b Merge pull request 'Update ghcr.io/mastodon/mastodon Docker tag to v4.3.3' () from renovate/ghcr.io-mastodon-mastodon-4.x into main
Reviewed-on: 
2025-01-17 19:11:30 +01:00
Ada
0aee543611 Merge pull request 'Update ghcr.io/mastodon/mastodon-streaming Docker tag to v4.3.3' () from renovate/ghcr.io-mastodon-mastodon-streaming-4.x into main
Reviewed-on: 
2025-01-17 19:10:50 +01:00
Ada
aa24c8afeb Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.8.0' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-01-17 19:10:47 +01:00
260e4e9854 Update ghcr.io/renovatebot/renovate Docker tag to v39.115.2 2025-01-17 16:25:27 +00:00
0709fabe1d Update gitlab/gitlab-ce Docker tag to v17.8.0 2025-01-16 13:26:51 +00:00
93c7fe3e66 Update ghcr.io/mastodon/mastodon-streaming Docker tag to v4.3.3 2025-01-16 11:23:38 +00:00
adc074cf77 Update ghcr.io/mastodon/mastodon Docker tag to v4.3.3 2025-01-16 11:23:26 +00:00
Ada
bc76c0e099 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.108.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-16 10:48:09 +01:00
Ada
01b4c53b4f Merge pull request 'Update codeberg.org/forgejo/forgejo Docker tag to v10' () from renovate/codeberg.org-forgejo-forgejo-10.x into main
Reviewed-on: 
2025-01-16 10:47:33 +01:00
94d7f1bf19 Update codeberg.org/forgejo/forgejo Docker tag to v10 2025-01-16 09:40:25 +00:00
7044cbbc30 Update ghcr.io/renovatebot/renovate Docker tag to v39.108.0 2025-01-16 09:28:51 +00:00
Ada
e7ee10b5d6 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.107.2' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-15 22:22:02 +01:00
Ada
628edb7484 Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.7.2' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-01-15 22:21:44 +01:00
5836973c63 Update ghcr.io/renovatebot/renovate Docker tag to v39.107.2 2025-01-15 10:09:28 +00:00
d9430457a8 Update gitlab/gitlab-ce Docker tag to v17.7.2 2025-01-15 03:06:58 +00:00
Ada
a1572868a1 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.106.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-12 22:10:24 +01:00
Ada
3b32f2b1e3 Merge pull request 'Update woodpeckerci/woodpecker-server Docker tag to v2.8.3' () from renovate/woodpeckerci-woodpecker-server-2.x into main
Reviewed-on: 
2025-01-12 22:10:13 +01:00
1bcb9e59c9 Update ghcr.io/renovatebot/renovate Docker tag to v39.106.0 2025-01-12 13:26:54 +00:00
3bfd1eeec2 Update woodpeckerci/woodpecker-server Docker tag to v2.8.3 2025-01-12 09:45:32 +00:00
Ada
9930fd42bd Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.96.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-08 18:02:40 +01:00
Ada
437c8f8ae3 Merge pull request 'Update gitlab/gitlab-ce Docker tag to v17.7.1' () from renovate/gitlab-gitlab-ce-17.x into main
Reviewed-on: 
2025-01-08 18:02:36 +01:00
cbe1d5b699 Update ghcr.io/renovatebot/renovate Docker tag to v39.96.0 2025-01-08 15:24:24 +00:00
5eb02eba76 Update gitlab/gitlab-ce Docker tag to v17.7.1 2025-01-08 13:20:04 +00:00
Ada
79e23b74af
Bump version 2025-01-07 21:08:31 +01:00
Ada
fa5a707898 Merge pull request 'Update ghcr.io/renovatebot/renovate Docker tag to v39.93.0' () from renovate/ghcr.io-renovatebot-renovate-39.x into main
Reviewed-on: 
2025-01-07 21:03:57 +01:00
Ada
27bca8495b Merge pull request 'Update python Docker tag to v3.13' () from renovate/python-3.x into main
Reviewed-on: 
2025-01-07 21:03:44 +01:00
00de7abe16 Update ghcr.io/renovatebot/renovate Docker tag to v39.93.0 2025-01-07 17:08:16 +00:00
95f5c919f1 also keep non greped lines. 2025-01-06 23:37:04 +01:00
ec22cbb365 keep exit code 2025-01-06 23:32:12 +01:00
6d3def79f6 Fix CICD 2025-01-06 23:31:27 +01:00
4dd9498811 test 2025-01-06 21:24:28 +01:00
0dded1a072 Update python Docker tag to v3.13 2025-01-06 20:18:52 +00:00
b573b4cb85 add cicd 2025-01-06 21:18:01 +01:00
c492de29d9 update ci setup 2025-01-06 21:11:08 +01:00
fff7b70527 fix conflicts 2025-01-06 21:10:56 +01:00
87560edbc4 Update mcuadros/ofelia Docker tag to v3 2025-01-02 18:58:17 +00:00
23 changed files with 109 additions and 38 deletions

28
.ci/gen_output.sh Executable file
View file

@ -0,0 +1,28 @@
echo "\`\`\`" > output.txt
process_output() {
if [ $? -eq 0 ]; then
head -n 5 output_tmp.txt >> output.txt
echo "... [See pipeline output for full details]" >> output.txt
tail -n 5 output_tmp.txt >> output.txt
else
cat output_tmp.txt >> output.txt
fi
}
echo "-- START Port attribution watcher --" | tee -a output.txt
python3 .ci/port_attribution_watcher.py | tee output_tmp.txt
process_output
echo "-- END Port attribution watcher --" | tee -a output.txt
echo "" >> output.txt
echo "-- START Traefik label watcher --" | tee -a output.txt
python3 .ci/traefik_label_watcher.py | tee output_tmp.txt
process_output
echo "-- END Traefik label watcher --" | tee -a output.txt
echo "\`\`\`" >> output.txt # Close the code block

0
.ci/lint.sh Normal file → Executable file
View file

11
.ci/lint_wrap.sh Executable file
View file

@ -0,0 +1,11 @@
set -o pipefail
sh .ci/lint.sh 2>&1 | tee output_tmp.txt
EXIT_CODE=$?
echo "\`\`\`" > output.txt
grep -n 'msg=' output_tmp.txt | awk -F'msg="' '{print $2}' | sed 's/"$//' | sed 's/\\"/"/g' >> output.txt
grep -v 'msg=' output_tmp.txt >> output.txt
echo "\`\`\`" >> output.txt
echo "END"
exit $EXIT_CODE

View file

@ -52,25 +52,20 @@ def main(watchFolder: str):
# Get exposed ports
exposedPorts = getExposedPortsFromDockerComposeFile(dockerComposeFile)
ports[dockerComposeFile] = exposedPorts
if len(exposedPorts) == 0:
if len(exposedPorts) != 0:
print(f"\n📦 {dockerComposeFile}"
f"\n🔴 No exposed ports found"
f"\n")
else:
print(f"\n📦 {dockerComposeFile}"
f"\n🔗 Exposed ports: {exposedPorts}"
f"\n")
f"\n🔗 Exposed ports: {exposedPorts}")
wrong = checkPortUnique(ports)
if wrong:
exit(1)
else:
print("\n\n✅ All ports are unique\n\n")
print("\n✅ All ports are unique")
exit(0)
if __name__ == "__main__":
print("Traefik label watcher CI/CD")
print("Port Attribution Watcher")
# Read folder from env
watchFolder = os.getenv("WATCH_FOLDER")
if watchFolder == None:

1
.ci/requirements.txt Normal file
View file

@ -0,0 +1 @@
pyyaml==6.0.2

View file

@ -85,7 +85,7 @@ def main(watchFolder: str):
if wrong:
exit(1)
else:
print("\n\n✅ All routers are unique\n\n")
print("\n\n✅ All routers are unique")
exit(0)
if __name__ == "__main__":

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
.vscode
.env.priv
.env.priv
.venv

View file

@ -1,14 +1,38 @@
steps:
lint:
image: debian:stable-slim
check_ports_labels:
image: python:3.13-slim
commands:
- pip3 install -r .ci/requirements.txt
- ./.ci/gen_output.sh
comment:
image: git.gnous.eu/enpls/gitea-comment-plugin:1.1
settings:
gitea_address: https://git.gnous.eu
gitea_token:
from_secret: gnous_cicd_token
comment_file: output.txt
when:
status: [failure, success]
event: [pull_request]
lint:
image: debian:stable
commands:
- rm -rf output.txt
- apt-get update
- apt-get install -y curl
- curl -SL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
- chmod +x //usr/local/bin/docker-compose
- sh .ci/lint.sh
when:
- event: pull_request
repo: gnouseu/docker-services
- event: push
branch: main
- chmod +x /usr/local/bin/docker-compose
- bash .ci/lint_wrap.sh
comment_2:
image: git.gnous.eu/enpls/gitea-comment-plugin:1.1
settings:
gitea_address: https://git.gnous.eu
gitea_token:
from_secret: gnous_cicd_token
comment_file: output.txt
when:
status: [failure, success]
event: [pull_request]
when:
- event: [push, pull_request]
- evaluate: 'CI_COMMIT_AUTHOR in ["gnous-ci-bot", "mael", "ada"]'

View file

@ -1,3 +1,14 @@
# Services Gnous
L'ensemble des docker compose pour les services du projet Gnous.
L'ensemble des docker compose pour les services du projet Gnous.
## Lint
```
python3 -m venv .venv/
source .venv/bin/activate
pip install -r .ci/requirements.txt
python3 .ci/port_attribution_watcher.py
python3 .ci/traefik_label_watcher.py
./.ci/lint.sh
```

View file

@ -9,7 +9,7 @@ volumes:
services:
server:
image: codeberg.org/forgejo/forgejo:9.0.3
image: codeberg.org/forgejo/forgejo:10.0.1
restart: always
container_name: forgejo
env_file:

View file

@ -4,7 +4,7 @@ networks:
services:
renovate:
image: ghcr.io/renovatebot/renovate:39.86.2-full
image: ghcr.io/renovatebot/renovate:39.170.2-full
restart: always
environment:
- LOG_LEVEL=info

View file

@ -8,7 +8,7 @@ volumes:
services:
server:
image: "searxng/searxng:2024.10.4-3e747d049"
image: "searxng/searxng:2025.1.6-6dab7fe78"
depends_on:
- "redis"
environment:

View file

@ -8,7 +8,7 @@ volumes:
services:
wallabag:
image: wallabag/wallabag
image: wallabag/wallabag:2.6.10
restart: unless-stopped
environment:
- SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql

View file

@ -7,7 +7,7 @@ services:
image: git.gnous.eu/gnouseu/wiki:v3
restart: unless-stopped
ports:
- "3005:80"
- "3010:80"
labels:
- "traefik.enable=true"
- "traefik.http.routers.wiki.entryPoints=websecure"

View file

@ -12,7 +12,7 @@ volumes:
services:
gitlab:
image: gitlab/gitlab-ce:17.7.0-ce.0
image: gitlab/gitlab-ce:17.9.0-ce.0
container_name: gitlab
restart: always
hostname: "gitlab.gnous.eu"

View file

@ -13,7 +13,7 @@ services:
- mastodon
web:
image: ghcr.io/mastodon/mastodon:v4.3.2
image: ghcr.io/mastodon/mastodon:v4.3.3
restart: always
env_file:
- path: .env.production
@ -44,7 +44,7 @@ services:
- "ofelia.job-exec.clean-account.command=tootctl accounts cull"
streaming:
image: ghcr.io/mastodon/mastodon-streaming:v4.3.2
image: ghcr.io/mastodon/mastodon-streaming:v4.3.3
restart: always
env_file:
- path: .env.production
@ -70,7 +70,7 @@ services:
- "traefik.http.routers.mastodon-streaming.middlewares=proxyHeader@file,proxyError@file"
sidekiq:
image: ghcr.io/mastodon/mastodon:v4.3.2
image: ghcr.io/mastodon/mastodon:v4.3.3
restart: always
env_file:
- path: .env.production

View file

@ -1,6 +1,6 @@
services:
ofelia:
image: mcuadros/ofelia:0.3.14
image: mcuadros/ofelia:v3.0.8
command: daemon --docker
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro

View file

@ -8,7 +8,7 @@ volumes:
services:
vaultwarden:
image: vaultwarden/server:1.32.7
image: vaultwarden/server:1.33.2
container_name: vaultwarden
environment:
- WEBSOCKET_ENABLED=true # Enable WebSocket notifications.

View file

@ -9,7 +9,7 @@ volumes:
services:
server:
image: woodpeckerci/woodpecker-server:v2.8.2
image: woodpeckerci/woodpecker-server:v3.1.0
container_name: woodpecker_server
environment:
- WOODPECKER_OPEN=true

View file

@ -14,7 +14,7 @@ services:
restart: unless-stopped
ports:
- 8085:3000
image: semaphoreui/semaphore:v2.11.2
image: semaphoreui/semaphore:v2.12.14
env_file:
- .env
environment:

View file

@ -10,7 +10,7 @@ services:
- db-data:/var/lib/postgresql/data
server:
image: ghcr.io/requarks/wiki:2.5.305
image: ghcr.io/requarks/wiki:2.5.306
depends_on:
- db
environment:

View file

@ -4,7 +4,7 @@ volumes:
services:
agent:
image: woodpeckerci/woodpecker-agent:latest
image: woodpeckerci/woodpecker-agent:next
container_name: woodpecker_agent
environment:
- WOODPECKER_SERVER=grpc.build.net.enpls.org:443

View file

@ -10,7 +10,7 @@ volumes:
services:
server:
image: woodpeckerci/woodpecker-server:v2.8.2
image: woodpeckerci/woodpecker-server:v3.1.0
container_name: woodpecker_server
environment:
- WOODPECKER_OPEN=false
@ -53,7 +53,7 @@ services:
- "traefik.http.routers.woodpecker-grpc-secure.entrypoints=websecure"
- "traefik.http.routers.woodpecker-grpc-secure.service=woodpecker-grpc"
- "traefik.http.routers.woodpecker-grpc.middlewares=woodpecker-grpc-redirect@docker"
- "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file"
- "traefik.http.routers.woodpecker-grpc.middlewares=proxyHeader@file,proxyError@file"
depends_on:
- db