From 13d9b82be72f893006fbde105f9ac0fdd3f5dee6 Mon Sep 17 00:00:00 2001 From: Willie Date: Sun, 22 Feb 2026 11:41:19 +0800 Subject: [PATCH] fix: devcontainer token loading from .env and host env fallback - Remove token vars from remoteEnv (localEnv overrides .env with empty) - Pass host tokens via docker-compose environment as fallback - Add profile.d script to source .devcontainer/.env in login shells - Add sandbox token passthrough for GitLab/Bitbucket/generic tokens - Add root .env to .gitignore --- .devcontainer/devcontainer.json | 7 +------ .devcontainer/docker-compose.yml | 8 +++++--- .devcontainer/setup.sh | 11 +++++++++++ .gitignore | 3 ++- docker-compose.sandbox.yml | 8 ++++++++ 5 files changed, 27 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9dd8ebece..1c400d2dd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -17,12 +17,7 @@ }, "remoteEnv": { "PATH": "/workspace/.devcontainer/bin:/workspace/bin:${containerEnv:PATH}", - "SKILLSHARE_UI_HOST": "0.0.0.0", - "GITHUB_TOKEN": "${localEnv:GITHUB_TOKEN}", - "GITLAB_TOKEN": "${localEnv:GITLAB_TOKEN}", - "BITBUCKET_TOKEN": "${localEnv:BITBUCKET_TOKEN}", - "BITBUCKET_USERNAME": "${localEnv:BITBUCKET_USERNAME}", - "SKILLSHARE_GIT_TOKEN": "${localEnv:SKILLSHARE_GIT_TOKEN}" + "SKILLSHARE_UI_HOST": "0.0.0.0" }, "postCreateCommand": ".devcontainer/setup.sh", "postStartCommand": ".devcontainer/start-dev.sh", diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 6e774670a..ed1f0bed5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,12 +7,14 @@ services: dockerfile: docker/sandbox/Dockerfile working_dir: /workspace command: sleep infinity - env_file: - - path: .env - required: false environment: HOME: /tmp GOCACHE: /go/build-cache + GITHUB_TOKEN: ${GITHUB_TOKEN:-} + GITLAB_TOKEN: ${GITLAB_TOKEN:-} + BITBUCKET_TOKEN: ${BITBUCKET_TOKEN:-} + BITBUCKET_USERNAME: ${BITBUCKET_USERNAME:-} + SKILLSHARE_GIT_TOKEN: ${SKILLSHARE_GIT_TOKEN:-} volumes: - ..:/workspace - go-mod-cache:/go/pkg/mod diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 1bc6f7739..f3a30b40d 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -12,6 +12,17 @@ if [ "${HOME:-}" != "/tmp" ] || [ ! -d /workspace ] || [ ! -f /workspace/go.mod fi cd /workspace +# ── 0. Token env: .env overrides host-passed env vars ──────────────── +# Docker-compose passes host tokens via environment (fallback). +# If .devcontainer/.env exists, source it in every login shell to override. +cat > /etc/profile.d/skillshare-env.sh << 'PROFILE_EOF' +if [ -f /workspace/.devcontainer/.env ]; then + set -a + . /workspace/.devcontainer/.env + set +a +fi +PROFILE_EOF + # ── 1. Build CLI ──────────────────────────────────────────────────── echo "▸ Building skillshare binary …" make build diff --git a/.gitignore b/.gitignore index f6e1b3a59..ea3eb1810 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,8 @@ docs/plans/ video/node_modules/ -# Devcontainer secrets +# Secrets +.env .devcontainer/.env # Web UI diff --git a/docker-compose.sandbox.yml b/docker-compose.sandbox.yml index 93d598564..af276493c 100644 --- a/docker-compose.sandbox.yml +++ b/docker-compose.sandbox.yml @@ -39,6 +39,10 @@ services: HOME: /tmp GOCACHE: /go/build-cache GITHUB_TOKEN: ${GITHUB_TOKEN:-} + GITLAB_TOKEN: ${GITLAB_TOKEN:-} + BITBUCKET_TOKEN: ${BITBUCKET_TOKEN:-} + BITBUCKET_USERNAME: ${BITBUCKET_USERNAME:-} + SKILLSHARE_GIT_TOKEN: ${SKILLSHARE_GIT_TOKEN:-} sandbox-playground: <<: *sandbox-common @@ -57,6 +61,10 @@ services: GOCACHE: /go/build-cache PATH: /sandbox-home/.local/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin GITHUB_TOKEN: ${SKILLSHARE_PLAYGROUND_GITHUB_TOKEN:-} + GITLAB_TOKEN: ${GITLAB_TOKEN:-} + BITBUCKET_TOKEN: ${BITBUCKET_TOKEN:-} + BITBUCKET_USERNAME: ${BITBUCKET_USERNAME:-} + SKILLSHARE_GIT_TOKEN: ${SKILLSHARE_GIT_TOKEN:-} volumes: - .:/workspace:ro - go-mod-cache:/go/pkg/mod