Skip to content

Commit bc433f0

Browse files
authored
build: update devcontainer (#1197)
1 parent cb893a7 commit bc433f0

5 files changed

Lines changed: 28 additions & 6 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"ghcr.io/devcontainers-extra/features/bash-command:1": {
1111
"command": "poetry self add poetry-polylith-plugin"
1212
},
13-
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
13+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
14+
"moby": false
15+
},
1416
"ghcr.io/devcontainers-extra/features/gh-release:1": {
1517
"repo": "authzed/zed",
1618
"binaryNames": "zed"
@@ -32,15 +34,20 @@
3234
"ghcr.io/devcontainers-extra/features/kind:1": {
3335
"version": "v0.30.0"
3436
},
35-
"ghcr.io/devcontainers/features/go:1": {},
37+
"ghcr.io/devcontainers/features/go:1": {
38+
"version": "1.24"
39+
},
3640
"./rclone": {
3741
"rclone_repository": "https://github.com/SwissDataScienceCenter/rclone.git",
3842
"rclone_ref": "v1.71.2+renku-1"
39-
}
43+
},
44+
"./fix-yarnpkg": {}
4045
},
4146
"overrideFeatureInstallOrder": [
4247
"ghcr.io/devcontainers-extra/features/poetry",
43-
"ghcr.io/devcontainers-extra/features/bash-command"
48+
"ghcr.io/devcontainers-extra/features/bash-command",
49+
"./fix-yarnpkg",
50+
"ghcr.io/devcontainers/features/docker-in-docker"
4451
],
4552
"postCreateCommand": "poetry install --with dev && mkdir -p /home/vscode/.config/k9s",
4653
"customizations": {

.devcontainer/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
data_service:
3-
image: "mcr.microsoft.com/devcontainers/python:3.13-bookworm"
3+
image: "mcr.microsoft.com/devcontainers/python:3.13-trixie"
44
volumes:
55
- ../:/workspace:cached
66
- .poetry_cache/:/poetry_cache:delegated
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"id": "fix-yarnpkg",
3+
"version": "1.0.0",
4+
"name": "A feature to fix the GPG signing key of yarnpkg",
5+
"options": {}
6+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
# Temporary script until yarnpkg new key is propagated
4+
5+
set -ex
6+
7+
mkdir -p /etc/apt/keyrings
8+
curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor --yes -o /etc/apt/keyrings/yarn-archive-keyring.gpg
9+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/yarn-archive-keyring.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list

.devcontainer/rclone/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cd rclone
1212
git checkout "${RCLONE_REF}"
1313

1414
echo "Building rclone"
15-
make rclone
15+
CGO_ENABLED=0 make rclone
1616
cd $HOME
1717
rm -rf /tmp/rclone
1818

0 commit comments

Comments
 (0)