diff --git a/.github/workflows/docker-publish-tagged.yml b/.github/workflows/docker-publish-tagged.yml index 7ba783a..1f9cc05 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 @@ -31,7 +35,7 @@ jobs: # 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//') 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 && \