diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index bca7702..1e59941 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -2,10 +2,6 @@ depends_on: - lint - -variables: # https://woodpecker-ci.org/docs/usage/advanced-usage - - &NAME 'httpd' # wird für die Docker-Tags verwendet - clone: git: image: "woodpeckerci/plugin-git:2.5.0" @@ -32,10 +28,6 @@ steps: - | DATE=$(date --iso-8601=seconds) echo "DATE=$DATE" >> .variables - # set name - - | - NAME=*NAME - echo "NAME=$NAME" >> .variables build_and_push: # damit dieser Step laufen kann muss das Repo in der Woodpecker-GUI "privilegiert" sein image: "docker:25.0.3" @@ -46,21 +38,21 @@ steps: - source .variables - | docker buildx build \ - --tag registry.mgrote.net/$NAME \ - --tag registry.mgrote.net/$NAME:${CI_COMMIT_SHA:0:8} \ - --tag registry.mgrote.net/$NAME:${CI_COMMIT_BRANCH} \ - --tag registry.mgrote.net/$NAME:latest \ - --tag registry.mgrote.net/$NAME:$VERSION \ + --tag registry.mgrote.net/$CI_REPO_NAME \ + --tag registry.mgrote.net/$CI_REPO_NAME:${CI_COMMIT_SHA:0:8} \ + --tag registry.mgrote.net/$CI_REPO_NAME:${CI_COMMIT_BRANCH} \ + --tag registry.mgrote.net/$CI_REPO_NAME:latest \ + --tag registry.mgrote.net/$CI_REPO_NAME:$VERSION \ --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 \ --file Dockerfile . - - docker push registry.mgrote.net/$NAME:${CI_COMMIT_SHA:0:8} - - docker push registry.mgrote.net/$NAME:${CI_COMMIT_BRANCH} - - docker push registry.mgrote.net/$NAME:latest - - docker push registry.mgrote.net/$NAME:$VERSION - - docker push registry.mgrote.net/$NAME + - docker push registry.mgrote.net/$CI_REPO_NAME:${CI_COMMIT_SHA:0:8} + - docker push registry.mgrote.net/$CI_REPO_NAME:${CI_COMMIT_BRANCH} + - docker push registry.mgrote.net/$CI_REPO_NAME:latest + - docker push registry.mgrote.net/$CI_REPO_NAME:$VERSION + - docker push registry.mgrote.net/$CI_REPO_NAME when: - evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"' ...