From bb9002d306cc97f77c52e67e16abaea73b9549d4 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:00:02 +0100 Subject: [PATCH 1/9] Fix docker container --- .github/workflows/docker-ci-checks.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml index 9b6c1ff2..924b492a 100644 --- a/.github/workflows/docker-ci-checks.yml +++ b/.github/workflows/docker-ci-checks.yml @@ -10,23 +10,15 @@ on: - synchronize workflow_dispatch: -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }}-build-container - jobs: ci-checks: name: CI Checks runs-on: ubuntu-latest - container: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + container: ghcr.io/${{ github.repository }}-build-container steps: - uses: actions/checkout@v2 with: token: ${{ secrets.GH_TOKEN }} - - name: Setup Node and NPM - uses: volta-cli/action@v1 - with: - node-version: 14.15.1 - name: Cache pnpm modules uses: actions/cache@v2 From 77876871d509d96840384e9edfc7b327d0b857f0 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:05:16 +0100 Subject: [PATCH 2/9] Update docker build --- .github/workflows/docker-build.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 58ff45cd..c3dd765a 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -14,27 +14,21 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3.5.2 - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + uses: docker/login-action@v2.1.0 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Build and push Docker image - uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + uses: docker/build-push-action@v4.0.0 with: context: . file: .github/build/Dockerfile push: true - tags: ${{ steps.meta.outputs.tags }} + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latests labels: ${{ steps.meta.outputs.labels }} From 59c4a13388b0bb035c9285d4ddaddf4bb71c02d1 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:05:49 +0100 Subject: [PATCH 3/9] Fix tag --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c3dd765a..613b40e9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -29,6 +29,6 @@ jobs: context: . file: .github/build/Dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latests + tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest labels: ${{ steps.meta.outputs.labels }} From 356afe197e49d79994632b009d9bb876cc07dae1 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:11:27 +0100 Subject: [PATCH 4/9] Bump checkout version --- .github/workflows/docker-ci-checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml index 924b492a..ed34ab05 100644 --- a/.github/workflows/docker-ci-checks.yml +++ b/.github/workflows/docker-ci-checks.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest container: ghcr.io/${{ github.repository }}-build-container steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.GH_TOKEN }} From f8c4061900e7b131941202d936c1a45bf37817bc Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:12:14 +0100 Subject: [PATCH 5/9] Do everything as root --- .github/build/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/build/Dockerfile b/.github/build/Dockerfile index 9095dd92..8098ee03 100644 --- a/.github/build/Dockerfile +++ b/.github/build/Dockerfile @@ -5,7 +5,3 @@ RUN apt update && apt install jq -y ADD ./rush.json ./rush.json RUN npm install -g @microsoft/rush@`jq -r .rushVersion ./rush.json` RUN rm ./rush.json - -RUN useradd -ms /bin/bash builder -USER builder -WORKDIR /home/builder \ No newline at end of file From 0f537808ad28bcad5ee8a2a4f204f65fc9ab01fd Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:17:20 +0100 Subject: [PATCH 6/9] Try as root --- .github/workflows/docker-ci-checks.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml index ed34ab05..2d5e9aaf 100644 --- a/.github/workflows/docker-ci-checks.yml +++ b/.github/workflows/docker-ci-checks.yml @@ -14,7 +14,9 @@ jobs: ci-checks: name: CI Checks runs-on: ubuntu-latest - container: ghcr.io/${{ github.repository }}-build-container + container: + image: ghcr.io/${{ github.repository }}-build-container + options: --user root steps: - uses: actions/checkout@v3 with: From 4ad34fafe9edc46872f7cb5a35a4b11aa92832b3 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:20:49 +0100 Subject: [PATCH 7/9] Don't use custom token --- .github/workflows/docker-ci-checks.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml index 2d5e9aaf..1b51de75 100644 --- a/.github/workflows/docker-ci-checks.yml +++ b/.github/workflows/docker-ci-checks.yml @@ -16,11 +16,8 @@ jobs: runs-on: ubuntu-latest container: image: ghcr.io/${{ github.repository }}-build-container - options: --user root steps: - uses: actions/checkout@v3 - with: - token: ${{ secrets.GH_TOKEN }} - name: Cache pnpm modules uses: actions/cache@v2 From 2698efc984580717bad27b84a76dd214c9633307 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 15:23:19 +0100 Subject: [PATCH 8/9] Fix rush install --- .github/workflows/docker-ci-checks.yml | 4 ++-- common/config/rush/pnpm-lock.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-ci-checks.yml b/.github/workflows/docker-ci-checks.yml index 1b51de75..6281614b 100644 --- a/.github/workflows/docker-ci-checks.yml +++ b/.github/workflows/docker-ci-checks.yml @@ -29,5 +29,5 @@ jobs: restore-keys: | ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}- - - name: Install rush - run: node common/scripts/install-run-rush.js install + - name: Rush install + run: rush install diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 3c02dc18..8e1b0826 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -8,8 +8,8 @@ importers: ../../apps/my-app: specifiers: aws-sdk: ~2.932.0 - my-controls: workspace:^1.0.3 - my-toolchain: workspace:^1.0.2 + my-controls: workspace:^1.0.4 + my-toolchain: workspace:^1.0.3 typescript: ^3.0.3 whatwg-fetch: ^3.0.0 dependencies: @@ -22,7 +22,7 @@ importers: ../../libraries/my-controls: specifiers: - my-toolchain: workspace:^1.0.2 + my-toolchain: workspace:^1.0.3 typescript: ^3.0.3 devDependencies: my-toolchain: link:../../tools/my-toolchain From a8ef2077a748bbb68afbc6e9c660d44e1808b1a5 Mon Sep 17 00:00:00 2001 From: Edward Date: Thu, 18 May 2023 17:30:45 +0100 Subject: [PATCH 9/9] Tweak tags --- .github/workflows/docker-build.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 613b40e9..370e335f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -14,21 +14,28 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v2 - name: Log in to the Container registry - uses: docker/login-action@v2.1.0 + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + flavor: latest=true + - name: Build and push Docker image - uses: docker/build-push-action@v4.0.0 + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 with: context: . file: .github/build/Dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest + tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }}