From da05196916910b878462a3e7b64337bd1642aa3e Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:04:11 +0100 Subject: [PATCH 01/10] =?UTF-8?q?.drone.yml=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..a2aad1b --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +--- +kind: pipeline +name: build + +steps: +- name: docker + # See docs at https://plugins.drone.io/plugins/docker + image: plugins/docker + settings: + repo: git.qx9.de/websites/qx9.de + registry: git.qx9.de \ No newline at end of file From 4eb15d500faefe942093aec2e794595e05ec26ef Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:11:23 +0100 Subject: [PATCH 02/10] .drone.yml aktualisiert --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index a2aad1b..663def7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,5 +7,9 @@ steps: # See docs at https://plugins.drone.io/plugins/docker image: plugins/docker settings: + username: + from_secret: gitea_username + password: + from_secret: gitea_password repo: git.qx9.de/websites/qx9.de registry: git.qx9.de \ No newline at end of file From 0e0d31fae7f89306083c64e37925333175aaebc9 Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:23:00 +0100 Subject: [PATCH 03/10] .drone.yml aktualisiert --- .drone.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 663def7..a164a7b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,13 +3,18 @@ kind: pipeline name: build steps: -- name: docker - # See docs at https://plugins.drone.io/plugins/docker - image: plugins/docker - settings: - username: - from_secret: gitea_username - password: - from_secret: gitea_password - repo: git.qx9.de/websites/qx9.de - registry: git.qx9.de \ No newline at end of file + - name: submodules + image: alpine/git + commands: + - git submodule update --init --recursive --remote + + - name: docker + # See docs at https://plugins.drone.io/plugins/docker + image: plugins/docker + settings: + username: + from_secret: gitea_username + password: + from_secret: gitea_password + repo: git.qx9.de/websites/qx9.de + registry: git.qx9.de \ No newline at end of file From 8e4bc5660bab7c394f0f73e85d7d3f7f679edda4 Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:44:08 +0100 Subject: [PATCH 04/10] .drone.yml aktualisiert --- .drone.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.drone.yml b/.drone.yml index a164a7b..c8853ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,16 @@ steps: commands: - git submodule update --init --recursive --remote + - name: hugo + image: hugomods/hugo:latest + pull: always + commands: + - echo "Checking Hugo version." + - hugo version + - cd /drone/src/hugo/ + - hugo --verbose + - ls -al /drone/src/hugo/public + - name: docker # See docs at https://plugins.drone.io/plugins/docker image: plugins/docker From 55a08079dfa75e0eb31c45ac9560cba742f65f94 Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:52:50 +0100 Subject: [PATCH 05/10] .drone.yml aktualisiert --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index c8853ac..bc654d6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,11 +12,12 @@ steps: image: hugomods/hugo:latest pull: always commands: + - ls -al /drone/src - echo "Checking Hugo version." - hugo version - - cd /drone/src/hugo/ + - cd /drone/src - hugo --verbose - - ls -al /drone/src/hugo/public + - ls -al /drone/src/public - name: docker # See docs at https://plugins.drone.io/plugins/docker From afe2b39e3d207f16722a105decce0c10422b71c3 Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 06:58:47 +0100 Subject: [PATCH 06/10] .drone.yml aktualisiert --- .drone.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index bc654d6..6cbc448 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,11 +12,10 @@ steps: image: hugomods/hugo:latest pull: always commands: - - ls -al /drone/src - echo "Checking Hugo version." - hugo version - cd /drone/src - - hugo --verbose + - hugo - ls -al /drone/src/public - name: docker From 34fac30313994b34889bdb44c045125989c3051a Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 07:01:28 +0100 Subject: [PATCH 07/10] =?UTF-8?q?Dockerfile=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..0a87daa --- /dev/null +++ b/Dockerfile @@ -0,0 +1,2 @@ +FROM nginx:alpine +COPY --chown=nginx:nginx /drone/src/public /usr/share/nginx/html \ No newline at end of file From 8216c68231c1e9d1185e1deb82160e29e2fa995b Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 07:05:26 +0100 Subject: [PATCH 08/10] Dockerfile aktualisiert --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a87daa..70d5f29 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ FROM nginx:alpine -COPY --chown=nginx:nginx /drone/src/public /usr/share/nginx/html \ No newline at end of file +COPY --chown=nginx:nginx public /usr/share/nginx/html \ No newline at end of file From 8e4d0973ce9d5d0137d8addedbd6f93710466215 Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 07:12:59 +0100 Subject: [PATCH 09/10] =?UTF-8?q?docker-compose.yml=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..193cba2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,15 @@ +version: "3.3" + +services: + website: + image: git.qx9.de/websites/qx9.de:latest + restart: unless-stopped + networks: + - rproxy + labels: + - traefik.enable=true + +networks: + rproxy: + external: + name: rproxy \ No newline at end of file From 963111f73852ee5deff03c76c3f3e09984b65a0c Mon Sep 17 00:00:00 2001 From: Christian Weimann Date: Sat, 13 Jan 2024 07:15:44 +0100 Subject: [PATCH 10/10] docker-compose.yml aktualisiert --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 193cba2..537ba22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: - website: + qx9de: image: git.qx9.de/websites/qx9.de:latest restart: unless-stopped networks: