From 16cd1297e964fc65794d44176dcd51bb236766c9 Mon Sep 17 00:00:00 2001 From: Rui Date: Mon, 2 Sep 2024 08:57:07 +0100 Subject: [PATCH 1/2] chore: remove py and tf-doc from devcontainer --- .github/.devcontainer/devcontainer-lock.json | 23 ++++++++++++-------- .github/.devcontainer/devcontainer.json | 5 ++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/.devcontainer/devcontainer-lock.json b/.github/.devcontainer/devcontainer-lock.json index bbb9a57..2d26663 100644 --- a/.github/.devcontainer/devcontainer-lock.json +++ b/.github/.devcontainer/devcontainer-lock.json @@ -25,10 +25,15 @@ "resolved": "ghcr.io/devcontainers/features/github-cli@sha256:13b301a039ce9e0bb07d45ea0c106c946cfff01c3b9844bbec6b0c7bacba8de3", "integrity": "sha256:13b301a039ce9e0bb07d45ea0c106c946cfff01c3b9844bbec6b0c7bacba8de3" }, - "ghcr.io/devcontainers/features/python:1": { - "version": "1.6.4", - "resolved": "ghcr.io/devcontainers/features/python@sha256:046a904b940e1793327369f57f4b0a7d89febbdd9e77086a70feffdfa564f888", - "integrity": "sha256:046a904b940e1793327369f57f4b0a7d89febbdd9e77086a70feffdfa564f888" + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": { + "version": "1.2.0", + "resolved": "ghcr.io/devcontainers/features/kubectl-helm-minikube@sha256:ff50f0f68095dc2dadeb9bfd7e509b21b9fcfe012d708b303c55f7bedfa462d0", + "integrity": "sha256:ff50f0f68095dc2dadeb9bfd7e509b21b9fcfe012d708b303c55f7bedfa462d0" + }, + "ghcr.io/devcontainers/features/node:1": { + "version": "1.6.0", + "resolved": "ghcr.io/devcontainers/features/node@sha256:902b97a02d04ffd3404579d793f3e101d1126d4d198929196c5872ed75a6d351", + "integrity": "sha256:902b97a02d04ffd3404579d793f3e101d1126d4d198929196c5872ed75a6d351" }, "ghcr.io/devcontainers/features/terraform:1": { "version": "1.3.8", @@ -40,11 +45,6 @@ "resolved": "ghcr.io/dhoeric/features/act@sha256:2e99eed677768dff36de20e856f2f6fd285a30ea868dae229e848a2871c4462d", "integrity": "sha256:2e99eed677768dff36de20e856f2f6fd285a30ea868dae229e848a2871c4462d" }, - "ghcr.io/dhoeric/features/terraform-docs:1": { - "version": "1.0.0", - "resolved": "ghcr.io/dhoeric/features/terraform-docs@sha256:eb0c7b50809a020fa74ba924999caaf1bd2b43783ec1589775447dbca557623b", - "integrity": "sha256:eb0c7b50809a020fa74ba924999caaf1bd2b43783ec1589775447dbca557623b" - }, "ghcr.io/duduribeiro/devcontainer-features/neovim:1": { "version": "1.0.1", "resolved": "ghcr.io/duduribeiro/devcontainer-features/neovim@sha256:bc0189d90386de0f8a72393de2bb1402bdff8072a608e1aa362761b2a0da3fd6", @@ -59,6 +59,11 @@ "resolved": "ghcr.io/itsmechlark/features/1password@sha256:b1afa069f1c62f30721abe65cf55494ee89b2f248e94f7fdf207f62776743044", "integrity": "sha256:b1afa069f1c62f30721abe65cf55494ee89b2f248e94f7fdf207f62776743044" }, + "ghcr.io/jungaretti/features/make:1": { + "version": "1.0.1", + "resolved": "ghcr.io/jungaretti/features/make@sha256:08d5c03484f33c16ae19e1015cdb3ef967b38db66ad0ae7f896e4cdadbb59d20", + "integrity": "sha256:08d5c03484f33c16ae19e1015cdb3ef967b38db66ad0ae7f896e4cdadbb59d20" + }, "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { "version": "1.0.0", "resolved": "ghcr.io/robbert229/devcontainer-features/postgresql-client@sha256:aceac5b09662b4d169eb8c9497add67e0662ef71509b3011087d276e9eea5b1c", diff --git a/.github/.devcontainer/devcontainer.json b/.github/.devcontainer/devcontainer.json index a745e89..4dc76db 100644 --- a/.github/.devcontainer/devcontainer.json +++ b/.github/.devcontainer/devcontainer.json @@ -3,7 +3,6 @@ "image": "ubuntu:22.04", "features": { "ghcr.io/devcontainers/features/terraform:1": {}, - "ghcr.io/dhoeric/features/terraform-docs:1": {}, "ghcr.io/duduribeiro/devcontainer-features/neovim:1": { "version": "nightly" }, "ghcr.io/devcontainers/features/aws-cli:1": {}, "ghcr.io/itsmechlark/features/1password:1": {}, @@ -11,8 +10,8 @@ "ghcr.io/devcontainers/features/github-cli:1": {}, "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": { "version": "15" }, "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}, - "ghcr.io/devcontainers/features/python:1": { "version": "3.12" , "installTools": false }, "ghcr.io/devcontainers/features/node:1": { "version": "20.16"}, "ghcr.io/jungaretti/features/make:1": {}, - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} + "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} + } } From 609b5834bfc8f0803ef01d5049d970edc4760f65 Mon Sep 17 00:00:00 2001 From: Rui Date: Mon, 2 Sep 2024 09:05:18 +0100 Subject: [PATCH 2/2] chore: move files related to prebuild to .devcontainer --- .../pre-build/.devcontainer.json | 0 .../pre-build}/devcontainer-lock.json | 0 .github/workflows/pre-build-dev-container.yml | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename .github/.devcontainer/devcontainer.json => .devcontainer/pre-build/.devcontainer.json (100%) rename {.github/.devcontainer => .devcontainer/pre-build}/devcontainer-lock.json (100%) diff --git a/.github/.devcontainer/devcontainer.json b/.devcontainer/pre-build/.devcontainer.json similarity index 100% rename from .github/.devcontainer/devcontainer.json rename to .devcontainer/pre-build/.devcontainer.json diff --git a/.github/.devcontainer/devcontainer-lock.json b/.devcontainer/pre-build/devcontainer-lock.json similarity index 100% rename from .github/.devcontainer/devcontainer-lock.json rename to .devcontainer/pre-build/devcontainer-lock.json diff --git a/.github/workflows/pre-build-dev-container.yml b/.github/workflows/pre-build-dev-container.yml index 7762d56..c7843b6 100644 --- a/.github/workflows/pre-build-dev-container.yml +++ b/.github/workflows/pre-build-dev-container.yml @@ -39,7 +39,7 @@ jobs: name: Pre-build dev container image uses: devcontainers/ci@v0.3 with: - subFolder: .github + subFolder: .devcontainer/pre-build imageName: ghcr.io/${{ env.GITHUB_REPOSITORY_LOWER }} cacheFrom: ghcr.io/${{ env.GITHUB_REPOSITORY_LOWER }} push: always