From 10edabf09d782cbcb2c68db79638669a1f69f3d7 Mon Sep 17 00:00:00 2001 From: Kostiantyn Dvornik Date: Wed, 21 Feb 2024 21:47:18 +0200 Subject: [PATCH 1/4] chore: github actions --- .github/workflows/docker-build-test/action.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build-test/action.yml b/.github/workflows/docker-build-test/action.yml index cce2fd4..ff828be 100644 --- a/.github/workflows/docker-build-test/action.yml +++ b/.github/workflows/docker-build-test/action.yml @@ -27,15 +27,20 @@ runs: - name: Build base image uses: ./actions/docker/build with: - image-name: centos-base + image-name: centos-7.9-base-materials-designer dockerfile: ./dockerfiles/centos/Dockerfile + - name: Push updated application container + shell: bash -l {0} + run: | + docker push ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest + - name: Build container uses: ./actions/docker/build with: image-name: wave-test dockerfile: ./dockerfiles/app/Dockerfile - cli-args: --build-arg BASE_IMAGE=centos-base + cli-args: --build-arg BASE_IMAGE=ghcr.io/exabyte-io/centos-7.9-base-materials-designer - name: Run tests shell: bash -l {0} From e839ae8a7abb0b9fd3e0140505c017a846060a0d Mon Sep 17 00:00:00 2001 From: Timur Bazhirov Date: Wed, 21 Feb 2024 12:25:33 -0800 Subject: [PATCH 2/4] Update cicd.yml --- .github/workflows/cicd.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index c50204d..8a4ab05 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -25,6 +25,16 @@ jobs: token: ${{ secrets.BOT_GITHUB_TOKEN }} path: actions + - name: Login to GitHub Container registry + uses: docker/login-action@v1 + env: + GITHUB_USER: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + registry: ghcr.io + username: $GITHUB_USER + password: ${{ secrets.GITHUB_TOKEN }} + - name: Validate Dockerfile uses: ./actions/docker/validate with: From 12cd78a06738af19867413185c1176c83e4d1c4d Mon Sep 17 00:00:00 2001 From: Timur Bazhirov Date: Wed, 21 Feb 2024 12:26:51 -0800 Subject: [PATCH 3/4] Update action.yml --- .github/workflows/docker-build-test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-test/action.yml b/.github/workflows/docker-build-test/action.yml index ff828be..793c902 100644 --- a/.github/workflows/docker-build-test/action.yml +++ b/.github/workflows/docker-build-test/action.yml @@ -27,7 +27,7 @@ runs: - name: Build base image uses: ./actions/docker/build with: - image-name: centos-7.9-base-materials-designer + image-name: ghcr.io/exabyte-io/centos-7.9-base-materials-designer dockerfile: ./dockerfiles/centos/Dockerfile - name: Push updated application container From 8a3395715afae797363e517b15eda078d3857e91 Mon Sep 17 00:00:00 2001 From: Timur Bazhirov Date: Wed, 21 Feb 2024 12:44:58 -0800 Subject: [PATCH 4/4] Update action.yml --- .../workflows/docker-build-test/action.yml | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/.github/workflows/docker-build-test/action.yml b/.github/workflows/docker-build-test/action.yml index 793c902..863f142 100644 --- a/.github/workflows/docker-build-test/action.yml +++ b/.github/workflows/docker-build-test/action.yml @@ -1,10 +1,5 @@ name: Build docker container and run tests description: Assumes actions repository has been checked out -inputs: - aws-access-key-id: - required: true - aws-secret-access-key: - required: true runs: using: composite @@ -14,28 +9,22 @@ runs: with: key: docker-${{ runner.os }}-${{ hashFiles('package.json') }} - # - name: Pull base image - # uses: ./actions/docker/ecr - # id: login-ecr + # - name: Build base image + # uses: ./actions/docker/build # with: - # ecr-repository: centos-7.9-base - # aws-access-key-id: ${{ inputs.aws-access-key-id }} - # aws-secret-access-key: ${{ inputs.aws-secret-access-key }} - # image-tag: latest - # action: pull + # image-name: ghcr.io/exabyte-io/centos-7.9-base-materials-designer + # dockerfile: ./dockerfiles/centos/Dockerfile + # - name: Push updated base container + # shell: bash -l {0} + # run: | + # docker push ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest - - name: Build base image - uses: ./actions/docker/build - with: - image-name: ghcr.io/exabyte-io/centos-7.9-base-materials-designer - dockerfile: ./dockerfiles/centos/Dockerfile - - - name: Push updated application container + - name: Pull updated base container shell: bash -l {0} run: | - docker push ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest + docker pull ghcr.io/exabyte-io/centos-7.9-base-materials-designer:latest - - name: Build container + - name: Build app container uses: ./actions/docker/build with: image-name: wave-test