From e515e75cf3fb206691e8e5b37a0acb831a20ae0f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 10 Feb 2021 21:44:39 +0100 Subject: [PATCH] fix container build --- .drone.yml | 20 ++++++++++---------- Dockerfile | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 38ee115..3e7b15a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -55,13 +55,13 @@ steps: depends_on: - dryrun -- name: changelog - image: thegeeklab/git-chglog - commands: - - git-chglog --no-color --no-emoji --next-tag ${DRONE_TAG:-unreleased} ${DRONE_TAG:-unreleased} - - git-chglog --no-color --no-emoji -o CHANGELOG.md --next-tag ${DRONE_TAG:-unreleased} ${DRONE_TAG:-unreleased} - depends_on: - - tags +# - name: changelog +# image: thegeeklab/git-chglog +# commands: +# - git-chglog --no-color --no-emoji --next-tag ${DRONE_TAG:-unreleased} ${DRONE_TAG:-unreleased} +# - git-chglog --no-color --no-emoji -o CHANGELOG.md --next-tag ${DRONE_TAG:-unreleased} ${DRONE_TAG:-unreleased} +# depends_on: +# - tags - name: publish-dockerhub image: thegeeklab/drone-docker-buildx:20 @@ -77,7 +77,7 @@ steps: - refs/heads/main - refs/tags/** depends_on: - - changelog + - tags - name: publish-quay image: thegeeklab/drone-docker-buildx:20 @@ -94,7 +94,7 @@ steps: - refs/heads/main - refs/tags/** depends_on: - - changelog + - tags - name: publish-gitea image: plugins/gitea-release @@ -187,6 +187,6 @@ depends_on: --- kind: signature -hmac: 9eb83864be7efa2c804c362ba42fe1ea939caddd4892c0c36f1fd4a755053909 +hmac: 6d13bd36f88118cb9510f89e6801106af145fa2c1adfeb652b4860649d7b564c ... diff --git a/Dockerfile b/Dockerfile index 1c529d8..16f4a8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,11 +14,12 @@ ENV CHGLOG_VERSION="${BUILD_VERSION:-v0.10.0}" COPY overlay/ / -RUN apk add --update --no-cache --virtual .build-deps curl && \ +RUN apk add --update --no-cache --virtual .build-deps tar curl && \ apk add --update --no-cache git && \ echo "Installing git-chglog version '${KANBOARD_VERSION##v}' ..." && \ - curl -SsL -o /usr/local/bin/git-chglog "https://github.com/git-chglog/git-chglog/releases/download/${CHGLOG_VERSION}/git-chglog_${CHGLOG_VERSION##v}_linux_amd64.tar.gz" && \ - chmod 755 usr/local/bin/git-chglog && \ + curl -SsL "https://github.com/git-chglog/git-chglog/releases/download/${CHGLOG_VERSION}/git-chglog_${CHGLOG_VERSION##v}_linux_amd64.tar.gz" | \ + tar xz git-chglog -C /usr/local/bin && \ + chmod 755 /usr/local/bin/git-chglog && \ apk del .build-deps && \ rm -rf /var/cache/apk/* && \ rm -rf /tmp/* && \