From 8535eef50cee55daa926ab418028469e183c7a03 Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Wed, 28 Feb 2024 23:32:36 +0700 Subject: [PATCH 1/4] ci: add Verify tool versions step --- .github/workflows/docker-image.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c83d262..c804b2e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,7 +7,15 @@ on: jobs: build: runs-on: ubuntu-latest + env: + TOOLKIT_TAG: devops-toolkit-review:$(date +%s) steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag devops-toolkit-review:$(date +%s) + run: docker build . --file Dockerfile --tag $TOOLKIT_TAG + + - name: Verify tool versions + run: | + cd scripts + chmod +x check_version_in_toolkit.sh + ./check_version_in_toolkit.sh $TOOLKIT_TAG From e48fdb7de67745b1a480b03ad952c214c13a8784 Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Wed, 28 Feb 2024 23:35:17 +0700 Subject: [PATCH 2/4] ci: naming updates --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c804b2e..952062e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,14 +8,14 @@ jobs: build: runs-on: ubuntu-latest env: - TOOLKIT_TAG: devops-toolkit-review:$(date +%s) + TOOLKIT_IMAGE: devops-toolkit-review:$GITHUB_SHA steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag $TOOLKIT_TAG + run: docker build . --file Dockerfile --tag $TOOLKIT_IMAGE - name: Verify tool versions run: | cd scripts chmod +x check_version_in_toolkit.sh - ./check_version_in_toolkit.sh $TOOLKIT_TAG + ./check_version_in_toolkit.sh $TOOLKIT_IMAGE From 457553e2e186846831d17f8b8f7a5afc2d20530b Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Wed, 28 Feb 2024 23:37:28 +0700 Subject: [PATCH 3/4] ci: naming updates --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 952062e..0008f82 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest env: - TOOLKIT_IMAGE: devops-toolkit-review:$GITHUB_SHA + TOOLKIT_IMAGE: "devops-toolkit-review:$GITHUB_SHA" steps: - uses: actions/checkout@v3 - name: Build the Docker image From b3ad0fac62ebca0f4b7616b412b965b8a7da6c36 Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Wed, 28 Feb 2024 23:39:05 +0700 Subject: [PATCH 4/4] ci: naming updates.v1 --- .github/workflows/docker-image.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0008f82..cfc772a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -7,15 +7,13 @@ on: jobs: build: runs-on: ubuntu-latest - env: - TOOLKIT_IMAGE: "devops-toolkit-review:$GITHUB_SHA" steps: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --tag $TOOLKIT_IMAGE + run: docker build . --file Dockerfile --tag "devops-toolkit-review:$GITHUB_SHA" - name: Verify tool versions run: | cd scripts chmod +x check_version_in_toolkit.sh - ./check_version_in_toolkit.sh $TOOLKIT_IMAGE + ./check_version_in_toolkit.sh "devops-toolkit-review:$GITHUB_SHA"