From fce092676fd00fd82bd528cfa33a056313537970 Mon Sep 17 00:00:00 2001 From: Nils Jakobi Date: Sun, 9 Feb 2020 10:09:58 +0100 Subject: [PATCH 1/3] using commit branch as docker tag --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d29130c..cdb22bf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,4 +10,4 @@ steps: from_secret: docker_username password: from_secret: docker_password - tags: devel + tags: ${DRONE_COMMIT_BRANCH} -- 2.45.2 From a03630a591052373ec0ebed2b2c4ae4a4b438608 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 11 Sep 2023 18:14:02 +0200 Subject: [PATCH 2/3] Changed Hugo Version --- .woodpecker.yml | 36 ++++++++++++++++-------------------- Dockerfile | 2 +- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1e28819..fd71639 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -16,23 +16,19 @@ steps: password: from_secret: gitea_token tags: latest -# -#- 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 + when: + - branch: master + +- name: docker-devel + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/amd64 + 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: devel + when: + - branch: devel diff --git a/Dockerfile b/Dockerfile index 9816e25..12391d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM klakegg/hugo:0.101.0-onbuild AS builder +FROM klakegg/hugo:0.64.0-onbuild AS builder FROM nginx:1.25.2-alpine COPY --from=builder /target /usr/share/nginx/html -- 2.45.2 From 040fbcf63605225ab26cd669196f4b1178c3d428 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 11 Sep 2023 18:17:46 +0200 Subject: [PATCH 3/3] Changed year in footer --- themes/hugo_ff_theme/layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/hugo_ff_theme/layouts/partials/footer.html b/themes/hugo_ff_theme/layouts/partials/footer.html index 558dc65..4101c6c 100644 --- a/themes/hugo_ff_theme/layouts/partials/footer.html +++ b/themes/hugo_ff_theme/layouts/partials/footer.html @@ -13,6 +13,6 @@ {{ end }} {{ end }} - © 2019 Freifunk Rhein-Sieg e.V. + © 2023 Freifunk Rhein-Sieg e.V. \ No newline at end of file -- 2.45.2