diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json index a1b30cb..d05fc0e 100644 --- a/.devcontainer/devcontainer-lock.json +++ b/.devcontainer/devcontainer-lock.json @@ -1,5 +1,10 @@ { "features": { + "ghcr.io/devcontainers/features/common-utils:2": { + "version": "2.5.9", + "resolved": "ghcr.io/devcontainers/features/common-utils@sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a", + "integrity": "sha256:cb0c4d3c276f157eed17935747e364178d75fee17f55c4e129966f64633deb3a" + }, "ghcr.io/devcontainers/features/docker-in-docker:3": { "version": "3.0.1", "resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:ca2508495b01ba29eba93e8153772a2daa65eaa86471cc6863fe2a3d21933df9", diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3ee6e30..3d1a145 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,6 +2,9 @@ "name": "ci-github-nodejs", "image": "mcr.microsoft.com/devcontainers/base:debian", "features": { + "ghcr.io/devcontainers/features/common-utils:2": { + "configureZshAsDefaultShell": true + }, "ghcr.io/devcontainers/features/node:2": {}, "ghcr.io/devcontainers/features/docker-in-docker:3": { "moby": false @@ -22,10 +25,7 @@ "github.copilot-chat", "ms-vscode.makefile-tools", "biomejs.biome" - ], - "settings": { - "terminal.integrated.defaultProfile.linux": "zsh" - } + ] } } } diff --git a/.github/workflows/__main-ci.yml b/.github/workflows/__main-ci.yml index 5217079..1da2d1a 100644 --- a/.github/workflows/__main-ci.yml +++ b/.github/workflows/__main-ci.yml @@ -34,7 +34,7 @@ jobs: release: needs: ci if: github.event_name != 'schedule' - uses: hoverkraft-tech/ci-github-publish/.github/workflows/release-actions.yml@607069025f6c1312680ed0864c4d9f4338b82dfe # 0.26.5 + uses: hoverkraft-tech/ci-github-publish/.github/workflows/release-actions.yml@ed354ada70b9f518c2bb663e18a80041c2cf5156 # 0.27.1 permissions: contents: read with: diff --git a/.github/workflows/__test-workflow-continuous-integration.yml b/.github/workflows/__test-workflow-continuous-integration.yml index 17189f1..f2c4050 100644 --- a/.github/workflows/__test-workflow-continuous-integration.yml +++ b/.github/workflows/__test-workflow-continuous-integration.yml @@ -64,7 +64,7 @@ jobs: issues: read packages: write pull-requests: read - uses: hoverkraft-tech/ci-github-container/.github/workflows/docker-build-images.yml@c9088e8447c5a8be45157e17701023fc50ccb1c0 # 0.37.2 + uses: hoverkraft-tech/ci-github-container/.github/workflows/docker-build-images.yml@f8255a6a37eb141fa331527f5aed9b9e1d598c77 # 0.38.0 with: sign: false images: | diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b1708b3..ee3c6cc 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -294,10 +294,10 @@ jobs: runs-on: *ci-runner steps: - uses: hoverkraft-tech/ci-github-common/actions/checkout@2334d395217f9811699dbd4ace9d8559e4d99e0d # 0.37.3 - - uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2 + - uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3 with: languages: ${{ inputs.code-ql }} - - uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2 + - uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3 dependency-review: name: 🛡️ Dependency Review diff --git a/Dockerfile b/Dockerfile index e933e35..5d40b82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/hoverkraft-tech/docker-base-images/super-linter:0.6.0 +FROM ghcr.io/hoverkraft-tech/docker-base-images/super-linter:0.4.0 HEALTHCHECK --interval=5m --timeout=10s --start-period=30s --retries=3 CMD ["/bin/sh","-c","test -d /github/home"] ARG UID=1000 diff --git a/Makefile b/Makefile index 94f7c85..b6a5d5f 100644 --- a/Makefile +++ b/Makefile @@ -110,13 +110,14 @@ define run_linter DEFAULT_WORKSPACE="$(CURDIR)"; \ LINTER_IMAGE="linter:latest"; \ VOLUME="$$DEFAULT_WORKSPACE:$$DEFAULT_WORKSPACE"; \ - docker build --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag $$LINTER_IMAGE .; \ + docker build --platform=linux/amd64 --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag $$LINTER_IMAGE .; \ docker run \ + --platform=linux/amd64 \ + -v $$VOLUME \ + --rm \ -e DEFAULT_WORKSPACE="$$DEFAULT_WORKSPACE" \ -e FILTER_REGEX_INCLUDE="$(filter-out $@,$(MAKECMDGOALS))" \ $(1) \ - -v $$VOLUME \ - --rm \ $$LINTER_IMAGE endef