From 026afea4cf64c0c2d85f66b1760841e0e5e23db8 Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Fri, 5 Apr 2024 08:30:56 -0500 Subject: [PATCH 1/5] Change docker tag to match version, not hardcoded --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d93b0521..4043635d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -64,7 +64,7 @@ jobs: context: . file: docker/Dockerfile build-args: | - TAG=${{ matrix.os }}-0.21 + TAG=${{ steps.meta.outputs.version }} ROS_DISTRO=${{ matrix.distro }} push: ${{ env.PUSH_DOCKER_IMAGE }} tags: ${{ steps.meta.outputs.tags }} From 8361fdf3fd961afe82b51798f585132a9652fe83 Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 15 Apr 2024 16:26:48 -0500 Subject: [PATCH 2/5] Fix running docker workflow for PRs --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4043635d..4cd41bc5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -54,8 +54,8 @@ jobs: prefix= suffix= tags: | - type=ref,event=branch,prefix=${{ matrix.distro }}- - type=ref,event=pr,prefix=${{ matrix.distro }}- + type=ref,event=branch,prefix=${{ matrix.distro }}-,value=${{ env.BRANCH_NAME }} + type=raw,event=pr,prefix=${{ matrix.distro }}-,value=master type=semver,pattern={{major}}.{{minor}},prefix=${{ matrix.distro }}- - name: Build and push Docker image From 9d280aa6ad7f06814ce0f43094f717d2cccdf25d Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 15 Apr 2024 16:53:13 -0500 Subject: [PATCH 3/5] Pull down jammy/focal instead of humble/foxy --- .github/workflows/docker.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4cd41bc5..a22e75d9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -58,13 +58,20 @@ jobs: type=raw,event=pr,prefix=${{ matrix.distro }}-,value=master type=semver,pattern={{major}}.{{minor}},prefix=${{ matrix.distro }}- + - name: Set TAG environment variable based on metadata output + run: | + # All prior tesseract packages are on an OS level, being a ROS package, this is on a ROS distro level + TAG="${{ steps.meta.outputs.tags }}" + # Replace all occurrences of matrix.distro with matrix.os in the generated tags. e.g. humble->jammy + TAG="${TAG//${{ matrix.distro }}/${{ matrix.os }}}" + - name: Build and push Docker image uses: docker/build-push-action@v5 with: context: . file: docker/Dockerfile build-args: | - TAG=${{ steps.meta.outputs.version }} + TAG=${{ env.TAG }} ROS_DISTRO=${{ matrix.distro }} push: ${{ env.PUSH_DOCKER_IMAGE }} tags: ${{ steps.meta.outputs.tags }} From 7381ed12e61edc4a56724e7fba6d56b35ebc95ae Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 15 Apr 2024 16:56:42 -0500 Subject: [PATCH 4/5] Store TAG in GITHUB_ENV --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a22e75d9..4728775e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -64,6 +64,8 @@ jobs: TAG="${{ steps.meta.outputs.tags }}" # Replace all occurrences of matrix.distro with matrix.os in the generated tags. e.g. humble->jammy TAG="${TAG//${{ matrix.distro }}/${{ matrix.os }}}" + # Export TAG to the environment variable for use in subsequent steps + echo "TAG=$TAG" >> $GITHUB_ENV - name: Build and push Docker image uses: docker/build-push-action@v5 From c7e2a194c598b8c7a4bd87cb775162f83a16314c Mon Sep 17 00:00:00 2001 From: Tyler Marr Date: Mon, 15 Apr 2024 17:00:21 -0500 Subject: [PATCH 5/5] Fixed typo pointing to wrong output --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4728775e..8624be84 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -61,7 +61,7 @@ jobs: - name: Set TAG environment variable based on metadata output run: | # All prior tesseract packages are on an OS level, being a ROS package, this is on a ROS distro level - TAG="${{ steps.meta.outputs.tags }}" + TAG="${{ steps.meta.outputs.version }}" # Replace all occurrences of matrix.distro with matrix.os in the generated tags. e.g. humble->jammy TAG="${TAG//${{ matrix.distro }}/${{ matrix.os }}}" # Export TAG to the environment variable for use in subsequent steps