From 02a370ce798d7dfca753e0161c72e1c082a88885 Mon Sep 17 00:00:00 2001 From: eternaltyro Date: Thu, 7 Mar 2024 14:19:58 +0000 Subject: [PATCH 1/5] Add container image CI workflows --- .github/workflows/docker-image-build.yml | 25 ++++++++++++ .github/workflows/docker-image-push.yml | 50 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 .github/workflows/docker-image-build.yml create mode 100644 .github/workflows/docker-image-push.yml diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml new file mode 100644 index 0000000000..1dc54d3585 --- /dev/null +++ b/.github/workflows/docker-image-build.yml @@ -0,0 +1,25 @@ +name: TM Backend Container Image Build + +on: + push: + branches: + - develop + - deployment/hot-tasking-manager + - deployment/container-tasking-manager + - deployment/demo-tasking-manager + + pull_request: + branches: + - develop + - deployment/hot-tasking-manager + - deployment/container-tasking-manager + - deployment/demo-tasking-manager + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build TM Backend container image + run: docker build . --tag tasking-manager-backend:$(date +%Y%m%d%H%M) diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml new file mode 100644 index 0000000000..21380b152c --- /dev/null +++ b/.github/workflows/docker-image-push.yml @@ -0,0 +1,50 @@ +# +name: Create and publish a Docker image + +# Configures this workflow to run every time a change is pushed to the branch called `release`. +on: + push: + branches: + - develop + - deployment/hot-tasking-manager + - deployment/demo-tasking-manager + - deployment/container-tasking-manager +# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. +jobs: + build-and-push-image: + runs-on: ubuntu-latest + # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. + permissions: + contents: read + packages: write + # + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Log in to the Container registry + uses: docker/login-action@v3.0.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels. + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5.5.1 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages. + # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step. + - name: Build and push Docker image + uses: docker/build-push-action@v5.1.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 04f7f5ae4121c1104ffdd323e2aa30a88876cf16 Mon Sep 17 00:00:00 2001 From: eternaltyro Date: Thu, 7 Mar 2024 14:22:23 +0000 Subject: [PATCH 2/5] Add main branch to CI steps --- .github/workflows/docker-image-build.yml | 3 +++ .github/workflows/docker-image-push.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml index 1dc54d3585..0774e3cdcf 100644 --- a/.github/workflows/docker-image-build.yml +++ b/.github/workflows/docker-image-build.yml @@ -3,6 +3,7 @@ name: TM Backend Container Image Build on: push: branches: + - main - develop - deployment/hot-tasking-manager - deployment/container-tasking-manager @@ -10,6 +11,8 @@ on: pull_request: branches: + - main + - develop - develop - deployment/hot-tasking-manager - deployment/container-tasking-manager diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml index 21380b152c..f97e0aa3d5 100644 --- a/.github/workflows/docker-image-push.yml +++ b/.github/workflows/docker-image-push.yml @@ -5,6 +5,7 @@ name: Create and publish a Docker image on: push: branches: + - main - develop - deployment/hot-tasking-manager - deployment/demo-tasking-manager From 1372835c5528ef23e6aac9249148c373da9b2a30 Mon Sep 17 00:00:00 2001 From: eternaltyro Date: Thu, 7 Mar 2024 14:59:00 +0000 Subject: [PATCH 3/5] Streamline container image tagging --- .github/workflows/docker-image-build.yml | 28 ------------------ .github/workflows/docker-image-push.yml | 36 ++++++++++++++++++------ 2 files changed, 27 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/docker-image-build.yml diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml deleted file mode 100644 index 0774e3cdcf..0000000000 --- a/.github/workflows/docker-image-build.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: TM Backend Container Image Build - -on: - push: - branches: - - main - - develop - - deployment/hot-tasking-manager - - deployment/container-tasking-manager - - deployment/demo-tasking-manager - - pull_request: - branches: - - main - - develop - - develop - - deployment/hot-tasking-manager - - deployment/container-tasking-manager - - deployment/demo-tasking-manager - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Build TM Backend container image - run: docker build . --tag tasking-manager-backend:$(date +%Y%m%d%H%M) diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml index f97e0aa3d5..6da93fedd4 100644 --- a/.github/workflows/docker-image-push.yml +++ b/.github/workflows/docker-image-push.yml @@ -1,7 +1,6 @@ # -name: Create and publish a Docker image +name: Create and publish Tasking Manager backend container image -# Configures this workflow to run every time a change is pushed to the branch called `release`. on: push: branches: @@ -10,12 +9,20 @@ on: - deployment/hot-tasking-manager - deployment/demo-tasking-manager - deployment/container-tasking-manager -# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds. + + pull_request: + - main + - develop + - deployment/hot-tasking-manager + - deployment/demo-tasking-manager + - deployment/container-tasking-manager + + env: REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} + IMAGE_NAME: tasking-manager-backend + -# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu. jobs: build-and-push-image: runs-on: ubuntu-latest @@ -23,7 +30,7 @@ jobs: permissions: contents: read packages: write - # + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -39,9 +46,20 @@ jobs: id: meta uses: docker/metadata-action@v5.5.1 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages. - # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step. + images: | + ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + tags: | + type=ref,event=branch + type=ref,event=pr + type=ref,event=tag + type=semver,pattern=raw + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + type=raw,value=dev-latest + - name: Build and push Docker image uses: docker/build-push-action@v5.1.0 with: From 9917afbce04002094e08676bf3b5b385bc142bb7 Mon Sep 17 00:00:00 2001 From: eternaltyro Date: Thu, 7 Mar 2024 15:00:36 +0000 Subject: [PATCH 4/5] Fix typo --- .github/workflows/docker-image-push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml index 6da93fedd4..fe7a03751b 100644 --- a/.github/workflows/docker-image-push.yml +++ b/.github/workflows/docker-image-push.yml @@ -11,6 +11,7 @@ on: - deployment/container-tasking-manager pull_request: + branches: - main - develop - deployment/hot-tasking-manager From d6a3b5d1a22538f879b3a0dc995b822e950309bf Mon Sep 17 00:00:00 2001 From: eternaltyro Date: Thu, 7 Mar 2024 15:12:16 +0000 Subject: [PATCH 5/5] Revert to original image name --- .github/workflows/docker-image-push.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-image-push.yml b/.github/workflows/docker-image-push.yml index fe7a03751b..c1c29e6a30 100644 --- a/.github/workflows/docker-image-push.yml +++ b/.github/workflows/docker-image-push.yml @@ -21,7 +21,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: tasking-manager-backend + IMAGE_NAME: ${{ github.repository }} jobs: @@ -47,11 +47,9 @@ jobs: id: meta uses: docker/metadata-action@v5.5.1 with: - images: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | - type=ref,event=branch type=ref,event=pr type=ref,event=tag type=semver,pattern=raw @@ -60,7 +58,7 @@ jobs: type=semver,pattern={{major}} type=sha type=raw,value=dev-latest - + - name: Build and push Docker image uses: docker/build-push-action@v5.1.0 with: