From 8a4fcf0f32d85501609816ba1c5290e2da89dd57 Mon Sep 17 00:00:00 2001 From: Thirsty2 Date: Thu, 29 Oct 2020 12:22:55 -0700 Subject: [PATCH 1/3] change default TAG to v0.0.0 and inject version tag during build. --- Dockerfile.use-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.use-installer b/Dockerfile.use-installer index 6b0033a..9858b71 100644 --- a/Dockerfile.use-installer +++ b/Dockerfile.use-installer @@ -15,7 +15,7 @@ RUN echo "dash dash/sh boolean false" | debconf-set-selections RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash # add ARGs so that these can be passed in while doing a docker build, the following will be default values -ARG TAG=v1.3.0 +ARG TAG=v0.0.0 ENV INSTALL_DIR="/opt/symbiflow/eos-s3" # Appending all of these commands (mostly the chmod 755 commands) saved about 1.9 GB in image size RUN wget https://github.com/QuickLogic-Corp/quicklogic-fpga-toolchain/releases/download/${TAG}/Symbiflow_${TAG}.gz.run && \ From f16c3392d246a429a7295f4569e9b40016fbb42c Mon Sep 17 00:00:00 2001 From: Thirsty2 Date: Thu, 29 Oct 2020 12:23:33 -0700 Subject: [PATCH 2/3] change default TAG to v0.0.0 and inject version tag during build. --- .github/workflows/docker-publish-tagged.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish-tagged.yml b/.github/workflows/docker-publish-tagged.yml index 7ba783a..cb50093 100644 --- a/.github/workflows/docker-publish-tagged.yml +++ b/.github/workflows/docker-publish-tagged.yml @@ -17,7 +17,11 @@ jobs: - uses: actions/checkout@v2 - name: Build image - run: docker build --build-arg GITHUB_WORKSPACE=$GITHUB_WORKSPACE . --file Dockerfile.use-installer --tag $IMAGE_NAME + run: | + # Strip git ref prefix from version + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + + docker build --build-arg TAG=$VERSION . --file Dockerfile.use-installer --tag $IMAGE_NAME - name: Log into registry run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin @@ -29,9 +33,6 @@ jobs: # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - # Strip git ref prefix from version - VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') - # Strip "v" prefix from tag name [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//') From c9cb2a3d6cf2b98c096b08fde51c3932d046e251 Mon Sep 17 00:00:00 2001 From: Thirsty2 Date: Thu, 29 Oct 2020 19:22:32 -0700 Subject: [PATCH 3/3] fix missing version tag in push image pipeline. --- .github/workflows/docker-publish-tagged.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-publish-tagged.yml b/.github/workflows/docker-publish-tagged.yml index cb50093..1f9cc05 100644 --- a/.github/workflows/docker-publish-tagged.yml +++ b/.github/workflows/docker-publish-tagged.yml @@ -33,6 +33,9 @@ jobs: # Change all uppercase to lowercase IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') + # Strip git ref prefix from version + VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,') + # Strip "v" prefix from tag name [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')