diff --git a/.drone.yml b/.drone.yml index ab746fc..4393176 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,9 +23,8 @@ steps: commands: - scripts/setupEnvironment.sh - export TEA_URL=`curl -L https://gitea.com/gitea/tea/releases/latest | grep -e "tea.*linux-amd64\"" | cut -d '"' -f 6` - - sed 's/ARG.TEA_URL.*/ARG \"${TEA_URL}/\"' -i Dockerfile + - sed 's,ARG TEA_URL.*',"ARG TEA_URL=\"$TEA_URL\""',' -i Dockerfile - cp /etc/ssl/certs2/federationHQ-CA.pem . - - sed 's/ARG.ORG_CA_FILE/ARG \/etc\/ssl\/certs2\/federationHQ-CA\.pem/' -i Dockerfile - buildah bud --network host -t "registry.cloud.federationhq.de/tea:latest-amd64" --arch amd64 . - buildah push --all registry.cloud.federationhq.de/tea:latest-amd64 --- @@ -54,9 +53,8 @@ steps: commands: - scripts/setupEnvironment.sh - export TEA_URL=`curl -L https://gitea.com/gitea/tea/releases/latest | grep -e "tea.*linux-arm64\"" | cut -d '"' -f 6` - - sed 's/ARG.TEA_URL.*/ARG \"${TEA_URL}/\"' -i Dockerfile + - sed 's,ARG TEA_URL.*',"ARG TEA_URL=\"$TEA_URL\""',' -i Dockerfile - cp /etc/ssl/certs2/federationHQ-CA.pem . - - sed 's/ARG.ORG_CA_FILE/ARG \/etc\/ssl\/certs2\/federationHQ-CA\.pem/' -i Dockerfile - buildah bud --network host -t "registry.cloud.federationhq.de/tea:latest-arm64" --arch arm64 . - buildah push --all registry.cloud.federationhq.de/tea:latest-arm64 --- diff --git a/Dockerfile b/Dockerfile index 93fa663..6cddcb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:latest ARG TEA_URL="https://gitea.com/gitea/t0ea/releases/download/v0.9.2/tea-0.9.2-linux-amd64" -ARG ORG_CA_FILE="/etc/ssl/certs2/federationHQ-CA.pem" +ARG ORG_CA_FILE="federationHQ-CA.pem" RUN apk --no-cache add ca-certificates ADD ${ORG_CA_FILE} /usr/local/share/ca-certificates