diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9a268bc5a..d409dcc07 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -14,5 +14,10 @@ "EDITOR": "vim" }, "postCreateCommand": "/usr/local/bin/init-home.sh", - "postStartCommand": "claude --version && cargo --version && kubectl cluster-info 2>/dev/null || true" + "postStartCommand": "claude --version && cargo --version && kubectl cluster-info 2>/dev/null || true", + "customizations": { + "devpod": { + "provider": "kubernetes" + } + } } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d0b606ce..9ea6d812a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,14 +78,13 @@ build-devcontainer: before_script: - mkdir -p /kaniko/.docker - | - echo "{\"auths\":{\"${INTERNAL_REGISTRY}\":{\"username\":\"${CI_REGISTRY_USER}\",\"password\":\"${CI_REGISTRY_PASSWORD}\"},\"rg.fr-par.scw.cloud\":{\"username\":\"nologin\",\"password\":\"${SCW_SECRET_KEY}\"}}}" > /kaniko/.docker/config.json + echo "{\"auths\":{\"rg.fr-par.scw.cloud\":{\"username\":\"nologin\",\"password\":\"${SCW_SECRET_KEY}\"}}}" > /kaniko/.docker/config.json script: - /kaniko/executor --context "${CI_PROJECT_DIR}" --dockerfile "${CI_PROJECT_DIR}/.devcontainer/Dockerfile" - --insecure-registry "${INTERNAL_REGISTRY}" - --destination "${REGISTRY}/devcontainer:${CI_COMMIT_SHA}" - --destination "${REGISTRY}/devcontainer:latest" + --destination "rg.fr-par.scw.cloud/foxhunt-ci/devcontainer:${CI_COMMIT_SHA}" + --destination "rg.fr-par.scw.cloud/foxhunt-ci/devcontainer:latest" # Base template for Rust jobs — pre-baked CI builder from Scaleway CR # Image pre-exists in SCR; rebuild via build-ci-builder when Dockerfile changes diff --git a/scripts/devpod-setup.sh b/scripts/devpod-setup.sh index 16d20240c..8d1dd3f65 100755 --- a/scripts/devpod-setup.sh +++ b/scripts/devpod-setup.sh @@ -40,6 +40,7 @@ devpod provider set kubernetes \ DISK_SIZE=10Gi \ STORAGE_CLASS=scw-bssd \ INACTIVITY_TIMEOUT=30m \ + IMAGE_PULL_SECRETS=gitlab-registry \ POD_MANIFEST_TEMPLATE=.devcontainer/pod-template.yaml # Configure image pull secrets if not already present