From 6a3494504d632ce0a282e6a95828ee798d7e70e5 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 31 Mar 2023 18:48:22 +0200 Subject: [PATCH 1/7] Testing Change of Docker Repository --- .drone.yml | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index c6ce9d5..269fe3c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,29 +5,30 @@ steps: - name: docker image: plugins/docker settings: + registry: git.freifunk-rhein-sieg.net repo: fftdf/freifunk-rhein-sieg.net username: - from_secret: docker_username + from_secret: gitea_user password: - from_secret: docker_password + from_secret: gitea_token tags: ${DRONE_COMMIT_BRANCH} -- name: publish Website - image: appleboy/drone-ssh - settings: - host: freifunk-rhein-sieg.net - port: 22 - username: dronebot - password: - from_secret: ffrs_server_password - script: - - cd /opt/docker/ffrs-website-docker-compose/ - - docker-compose pull - - docker-compose up -d - -- name: slack - image: plugins/slack - settings: - webhook: - from_secret: slack_webhook - channel: z_rhein-sieg-website \ No newline at end of file +#- name: publish Website +# image: appleboy/drone-ssh +# settings: +# host: freifunk-rhein-sieg.net +# port: 22 +# username: dronebot +# password: +# from_secret: ffrs_server_password +# script: +# - cd /opt/docker/ffrs-website-docker-compose/ +# - docker-compose pull +# - docker-compose up -d +# +#- name: slack +# image: plugins/slack +# settings: +# webhook: +# from_secret: slack_webhook +# channel: z_rhein-sieg-website \ No newline at end of file From d1c48e8474003511e1686699e0675d3aa172d873 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 31 Mar 2023 18:50:51 +0200 Subject: [PATCH 2/7] Test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 269fe3c..90ea702 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: password: from_secret: gitea_token tags: ${DRONE_COMMIT_BRANCH} - +# #- name: publish Website # image: appleboy/drone-ssh # settings: From 03e4a28e43ff42908a7d5197961d7fc248bb9115 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Tue, 22 Aug 2023 12:45:10 +0000 Subject: [PATCH 3/7] Update .woodpecker.yml --- .drone.yml => .woodpecker.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .drone.yml => .woodpecker.yml (100%) diff --git a/.drone.yml b/.woodpecker.yml similarity index 100% rename from .drone.yml rename to .woodpecker.yml From 40c3124f49ea3620adae3058ab6b50f93ae4f405 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Tue, 22 Aug 2023 12:54:18 +0000 Subject: [PATCH 4/7] Update .woodpecker.yml --- .woodpecker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 90ea702..473afba 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,15 +3,17 @@ name: website build steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: registry: git.freifunk-rhein-sieg.net - repo: fftdf/freifunk-rhein-sieg.net + platforms: linux/amd64,linux/arm64/v8 + registry: git.freifunk-rhein-sieg.net + repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net username: from_secret: gitea_user password: from_secret: gitea_token - tags: ${DRONE_COMMIT_BRANCH} + tags: latest # #- name: publish Website # image: appleboy/drone-ssh From dee8b02ff88fd9d50a2f206b68df7df9bbe3b4ca Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Tue, 22 Aug 2023 12:54:43 +0000 Subject: [PATCH 5/7] Update .woodpecker.yml --- .woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 473afba..f4b5abe 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,6 @@ steps: - name: docker image: woodpeckerci/plugin-docker-buildx settings: - registry: git.freifunk-rhein-sieg.net platforms: linux/amd64,linux/arm64/v8 registry: git.freifunk-rhein-sieg.net repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net From b1d9c742a3533533138f5e1f37be70a4d0b43cb3 Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Tue, 22 Aug 2023 12:56:20 +0000 Subject: [PATCH 6/7] Update .woodpecker.yml --- .woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index f4b5abe..8d8d9bb 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,6 @@ +--- +platform: linux/arm64 + kind: pipeline name: website build From 55c9972433db44e2299ec69f80c3f28f20c7946b Mon Sep 17 00:00:00 2001 From: Stefan Hoffmann Date: Tue, 22 Aug 2023 12:57:29 +0000 Subject: [PATCH 7/7] Update .woodpecker.yml --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8d8d9bb..1e28819 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -8,7 +8,7 @@ steps: - name: docker image: woodpeckerci/plugin-docker-buildx settings: - platforms: linux/amd64,linux/arm64/v8 + platforms: linux/amd64 registry: git.freifunk-rhein-sieg.net repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net username: