From e720f2499d13ef058f4bfff54098780be1cbcf47 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Fri, 26 Jun 2020 12:32:49 +0400 Subject: Fixed build args Signed-off-by: Valentin Popov --- .github/workflows/docker-publish.yml | 7 ++----- release/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 553ec51..8f084ea 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,9 +38,6 @@ jobs: - "1.5" - "1.4" - env: - RELEASE: ${{ matrix.version }} - steps: - uses: actions/checkout@v2 with: @@ -52,8 +49,8 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: valentineus/meteor - tags: ${{ env.RELEASE }} + tags: ${{ matrix.version }} path: release - build_args: RELEASE=${{ env.RELEASE }} + build_args: RELEASE=${{ matrix.version }} tag_with_ref: true tag_with_sha: true \ No newline at end of file diff --git a/release/Dockerfile b/release/Dockerfile index c383ba1..065fa0c 100644 --- a/release/Dockerfile +++ b/release/Dockerfile @@ -3,13 +3,13 @@ LABEL maintainer="info@valentineus.link" ENV METEOR_ALLOW_SUPERUSER="true" -ARG release +ARG RELEASE RUN set -ex \ && apt-get update \ && apt-get --no-install-recommends --no-install-suggests --yes install \ ca-certificates curl git openssl \ - && curl https://install.meteor.com | sed "s/^RELEASE=.*/RELEASE=$RELEASE/g" | sh \ + && curl https://install.meteor.com | sed "s/^RELEASE=.*/RELEASE=${RELEASE}/g" | sh \ && apt-get --purge --yes remove curl \ && apt-get --purge --yes autoremove \ && apt-get clean \ -- cgit v1.2.3