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
This commit is contained in:
Willie
2026-02-22 15:13:10 +08:00
parent 3b8c681bb2
commit 13d9b82be7
5 changed files with 27 additions and 10 deletions
+1 -6
View File
@@ -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",
+5 -3
View File
@@ -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
+11
View File
@@ -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
+2 -1
View File
@@ -30,7 +30,8 @@ docs/plans/
video/node_modules/
# Devcontainer secrets
# Secrets
.env
.devcontainer/.env
# Web UI
+8
View File
@@ -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