From 5390c6c0cf11539b47d5675779631db67f6a1a05 Mon Sep 17 00:00:00 2001 From: AdriaCarrera Date: Tue, 16 Jan 2024 15:50:02 +0100 Subject: [PATCH] fix: release workflow --- .github/workflows/release.yml | 5 ++++- Dockerfile | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7dc600f..74c6866 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,13 +27,16 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PUSH_TOKEN }} + - run: | + TAG=${{ github.event.inputs.tag }} + echo "VERSION=${TAG#v}" >> $GITHUB_ENV # Build and push docker image - name: Build docker image uses: docker/build-push-action@v4 with: target: release push: true - build-args: VERSION=${{ github.event.inputs.tag }} + build-args: VERSION=${{ env.VERSION }} tags: | peersyst/exrp:${{ github.event.inputs.tag }} ${{ fromJSON('["", "peersyst/exrp:latest"]')[github.event.inputs.is_latest_release == 'true'] }} diff --git a/Dockerfile b/Dockerfile index 3ca71e8..da70c09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,7 @@ RUN touch /test.lock FROM golang:1.20 AS release WORKDIR / -# TODO: Restore this -# COPY --from=integration /test.lock /test.lock +COPY --from=integration /test.lock /test.lock COPY --from=build /go/src/github.com/Peersyst/exrp/release /binaries COPY --from=build /usr/bin/exrpd /usr/bin/exrpd ENTRYPOINT ["/bin/sh", "-ec"]