From fff7b7052784e9e99f98eb3ef24f9bbb190e8264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Mon, 6 Jan 2025 21:10:56 +0100
Subject: [PATCH 1/3] fix conflicts
---
compute-1-mep/wiki/docker-compose.yaml | 2 +-
internals/woodpecker/docker-compose.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml
index d9edbef..9e0d7fd 100644
--- a/compute-1-mep/wiki/docker-compose.yaml
+++ b/compute-1-mep/wiki/docker-compose.yaml
@@ -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"
diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml
index 2ae2e57..b719bf2 100644
--- a/internals/woodpecker/docker-compose.yaml
+++ b/internals/woodpecker/docker-compose.yaml
@@ -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
From c492de29d968b29b1a357b394346f7881e64b5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Mon, 6 Jan 2025 21:11:08 +0100
Subject: [PATCH 2/3] update ci setup
---
.ci/lint.sh | 0
.ci/requirements.txt | 1 +
.gitignore | 3 ++-
README.md | 13 ++++++++++++-
4 files changed, 15 insertions(+), 2 deletions(-)
mode change 100644 => 100755 .ci/lint.sh
create mode 100644 .ci/requirements.txt
diff --git a/.ci/lint.sh b/.ci/lint.sh
old mode 100644
new mode 100755
diff --git a/.ci/requirements.txt b/.ci/requirements.txt
new file mode 100644
index 0000000..d03d21f
--- /dev/null
+++ b/.ci/requirements.txt
@@ -0,0 +1 @@
+pyyaml==6.0.2
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index d70df2c..5b6b397 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.vscode
-.env.priv
\ No newline at end of file
+.env.priv
+.venv
\ No newline at end of file
diff --git a/README.md b/README.md
index b694dfa..18eb693 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,14 @@
# Services Gnous
-L'ensemble des docker compose pour les services du projet Gnous.
\ No newline at end of file
+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
+```
\ No newline at end of file
From b573b4cb857b6fc95015c227e41385723464787d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Gramain?= <mael@enpls.org>
Date: Mon, 6 Jan 2025 21:18:01 +0100
Subject: [PATCH 3/3] add cicd
---
.woodpecker/lint.yml | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/.woodpecker/lint.yml b/.woodpecker/lint.yml
index b518d19..a9fea1e 100644
--- a/.woodpecker/lint.yml
+++ b/.woodpecker/lint.yml
@@ -1,14 +1,25 @@
steps:
+ check_ports_labels:
+ image: python:3.12-slim
+ commands:
+ - pip3 install -r .ci/requirements.txt
+ - python3 .ci/port_attribution_watcher.py
+ - python3 .ci/traefik_labels_watcher.py
+ when:
+ - event: pull_request
+ repo: gnouseu/docker-services
+ - event: push
+ branch: main
lint:
image: debian:stable-slim
commands:
- 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
+ - chmod +x /usr/local/bin/docker-compose
- sh .ci/lint.sh
when:
- event: pull_request
repo: gnouseu/docker-services
- event: push
- branch: main
+ branch: main
\ No newline at end of file