From da7d2d4a54f2a36b179584e8c0be774a4e75d6f1 Mon Sep 17 00:00:00 2001 From: Vegard Hagen Date: Mon, 14 Jul 2025 00:49:56 +0200 Subject: [PATCH] fix(devcontainer): add timeout for build job Signed-off-by: Vegard Hagen --- .devcontainer/Containerfile | 3 ++- .devcontainer/devcontainer.json | 4 ++-- .github/workflows/build-devcontainer.yaml | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Containerfile b/.devcontainer/Containerfile index 0fdd22b..7f0fb90 100644 --- a/.devcontainer/Containerfile +++ b/.devcontainer/Containerfile @@ -1 +1,2 @@ -FROM docker.io/ubuntu:24.04 +#FROM docker.io/ubuntu:24.04 +FROM mcr.microsoft.com/devcontainers/base:ubuntu22.04 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 3c18408..e1e931e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -22,9 +22,10 @@ "ghcr.io/devcontainers/features/hugo:1": { "extended": "true" }, - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {}, "ghcr.io/devcontainers-extra/features/argo-cd:1": {}, "ghcr.io/devcontainers-extra/features/helmfile:1": {}, + "ghcr.io/devcontainers-extra/features/kubectl-asdf:2": {}, + "ghcr.io/devcontainers-extra/features/kubectx-kubens:1": {}, "ghcr.io/devcontainers-extra/features/talosctl:1": {}, "ghcr.io/devcontainers-extra/features/yamllint:2": {}, "ghcr.io/dhoeric/features/k9s:1": {}, @@ -35,7 +36,6 @@ "jqVersion": "latest", "yqVersion": "latest" }, - "ghcr.io/jungaretti/features/vim:1": {}, "ghcr.io/robbert229/devcontainer-features/postgresql-client:1": {}, "ghcr.io/robbert229/devcontainer-features/opentofu:1": {}, "ghcr.io/schlich/devcontainer-features/powerlevel10k:1": {}, diff --git a/.github/workflows/build-devcontainer.yaml b/.github/workflows/build-devcontainer.yaml index 82076ad..a83d3fe 100644 --- a/.github/workflows/build-devcontainer.yaml +++ b/.github/workflows/build-devcontainer.yaml @@ -12,6 +12,7 @@ jobs: build: name: Build devcontainer runs-on: ubuntu-latest + timeout-minutes: 240 permissions: contents: read packages: write