From 1e80cb9ea0eca043150d733fcf69401cb50ae8d7 Mon Sep 17 00:00:00 2001
From: Michael Grote <michael.grote@posteo.de>
Date: Wed, 7 Feb 2024 21:05:56 +0100
Subject: [PATCH] ci: fix misc things... blablabla (#19)

Reviewed-on: https://git.mgrote.net/container-images/httpd/pulls/19
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>
---
 .woodpecker/build.yml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 4284ec5..6d06118 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -11,9 +11,10 @@ clone:
       partial: false
 
 steps:
-  set_version:
-    image: "registry.mgrote.net/allzweckcontainer:v1.0.164"
+  set_variables:
+    image: "registry.mgrote.net/allzweckcontainer:v1.0.167"
     commands:
+      # set version
       - |
         MAJOR="1"
         MINOR="1"
@@ -22,17 +23,19 @@ steps:
         if [ "$CI_COMMIT_BRANCH" != "main" ] && [ "$CI_COMMIT_BRANCH" != "master" ]; then
             VERSION=$VERSION-dev
         fi
-        echo "VERSION=$VERSION" > .version
-        cat .version
+        echo "VERSION=$VERSION" >> .variables
+      # set date
+      - |
+        DATE=$(date --iso-8601=seconds)
+        echo "DATE=$DATE" >> .variables
 
   build_and_push: # damit dieser Step laufen kann muss das Repo in der Woodpecker-GUI "privilegiert" sein
     image: "docker:25.0.3"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     commands:
-      - cat .version
-      - echo TIME; date -u -Iseconds
-      - source .version
+      - cat .variables
+      - source .variables
       - |
         docker buildx build \
         --tag registry.mgrote.net/httpd \
@@ -43,9 +46,13 @@ steps:
         --label org.opencontainers.image.url=$CI_REPO_URL \
         --label org.opencontainers.image.source=$CI_REPO_URL \
         --label org.opencontainers.image.revision=$CI_COMMIT_SHA \
-        --label org.opencontainers.image.created=$(date -u -Iseconds) \
+        --label org.opencontainers.image.created=$DATE \
         --file Dockerfile .
-      - docker push --all-tags registry.mgrote.net/httpd
+      - docker push registry.mgrote.net/httpd:${CI_COMMIT_SHA:0:8}
+      - docker push registry.mgrote.net/httpd:${CI_COMMIT_BRANCH}
+      - docker push registry.mgrote.net/httpd:latest
+      - docker push registry.mgrote.net/httpd:$VERSION
+      - docker push registry.mgrote.net/httpd
     when:
       - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
 ...