Skip to content

Commit 29bfb9b

Browse files
committed
feat: refactor some vars
1 parent ff19d4d commit 29bfb9b

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

Dockerfile

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,6 @@ LABEL org.opencontainers.image.title="autonomousworld-vscode" \
1515

1616
SHELL ["/bin/bash", "-c"]
1717

18-
# --------------------------------------------
19-
# Build args (opt-in toggles)
20-
# --------------------------------------------
21-
ARG COPILOT_CLI_ENABLED=false
22-
ARG COPILOT_CLI_MCP_SEED=false
23-
ARG COPILOT_CLI_INSTALL_METHOD=auto
24-
ARG COPILOT_CLI_VERSION=
25-
ARG COPILOT_CLI_PREFIX=/usr/local
26-
ARG BROWSERS_ENABLED=false
2718

2819
# --------------------------------------------
2920
# ENV Defaults (override with Docker Compose or CLI)
@@ -39,12 +30,13 @@ ENV LANGUAGES=node,python,java \
3930
OPENAI_API_KEY=your_openai_api_key_here \
4031
OPENAI_MODEL=gpt-4 \
4132
GITLAB_PERSONAL_ACCESS_TOKEN=your_gitlab_token_here \
42-
COPILOT_CLI_ENABLED=${COPILOT_CLI_ENABLED} \
43-
COPILOT_CLI_MCP_SEED=${COPILOT_CLI_MCP_SEED} \
44-
COPILOT_CLI_INSTALL_METHOD=${COPILOT_CLI_INSTALL_METHOD} \
45-
COPILOT_CLI_VERSION=${COPILOT_CLI_VERSION} \
46-
COPILOT_CLI_PREFIX=${COPILOT_CLI_PREFIX} \
47-
BROWSERS_ENABLED=${BROWSERS_ENABLED}
33+
COPILOT_CLI_ENABLED=false \
34+
COPILOT_CLI_MCP_ENABLED=false \
35+
COPILOT_CLI_INSTALL_METHOD=auto \
36+
COPILOT_CLI_VERSION= \
37+
COPILOT_CLI_PREFIX=/usr/local \
38+
COPILOT_GITHUB_TOKEN=${COPILOT_GITHUB_TOKEN} \
39+
BROWSERS_ENABLED=false
4840

4941
# --------------------------------------------
5042
# Locale setup

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ Use build args (recommended) to enable the install and seed the MCP config:
143143

144144
```bash
145145
COPILOT_CLI_ENABLED=true \
146-
COPILOT_CLI_MCP_SEED=true \
146+
COPILOT_CLI_MCP_ENABLED=true \
147147
docker compose -f docker-compose.yml up --build
148148
```
149149

docker-compose.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile
6-
args:
7-
COPILOT_CLI_ENABLED: "${COPILOT_CLI_ENABLED:-false}"
8-
COPILOT_CLI_MCP_SEED: "${COPILOT_CLI_MCP_SEED:-false}"
9-
COPILOT_CLI_INSTALL_METHOD: "${COPILOT_CLI_INSTALL_METHOD:-auto}"
10-
COPILOT_CLI_VERSION: "${COPILOT_CLI_VERSION:-}"
11-
COPILOT_CLI_PREFIX: "${COPILOT_CLI_PREFIX:-/usr/local}"
12-
BROWSERS_ENABLED: "${BROWSERS_ENABLED:-false}"
136
container_name: aw-dev-node
147
ports:
158
- "${VSCODE_PORT:-8443}:${VSCODE_PORT:-8443}"
@@ -25,7 +18,7 @@ services:
2518
OPENAI_API_KEY: "${OPENAI_API_KEY}"
2619
OPENAI_MODEL: "${OPENAI_MODEL}"
2720
COPILOT_CLI_ENABLED: "${COPILOT_CLI_ENABLED:-false}"
28-
COPILOT_CLI_MCP_SEED: "${COPILOT_CLI_MCP_SEED:-false}"
21+
COPILOT_CLI_MCP_ENABLED: "${COPILOT_CLI_MCP_ENABLED:-false}"
2922
COPILOT_CLI_INSTALL_METHOD: "${COPILOT_CLI_INSTALL_METHOD:-auto}"
3023
COPILOT_CLI_VERSION: "${COPILOT_CLI_VERSION:-}"
3124
COPILOT_CLI_PREFIX: "${COPILOT_CLI_PREFIX:-/usr/local}"

env.example

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ OPENAI_MODEL=gpt-4
1616

1717
# Copilot CLI (opt-in, build args recommended)
1818
COPILOT_CLI_ENABLED=false
19-
COPILOT_CLI_MCP_SEED=false
19+
COPILOT_CLI_MCP_ENABLED=false
2020
COPILOT_CLI_INSTALL_METHOD=auto
2121
COPILOT_CLI_VERSION=
2222
COPILOT_CLI_PREFIX=/usr/local
23+
COPILOT_GITHUB_TOKEN=your_github_personal_access_token_here
2324

2425
# Browser runtime for MCPs (opt-in, build args recommended)
2526
BROWSERS_ENABLED=false

src/scripts/install_copilot_cli.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ echo "Installing GitHub Copilot CLI (opt-in)"
88
: "${COPILOT_CLI_INSTALL_URL:=https://gh.io/copilot-install}"
99
: "${COPILOT_CLI_PREFIX:=/usr/local}"
1010
: "${COPILOT_CLI_VERSION:=}"
11-
: "${COPILOT_CLI_MCP_SEED:=false}"
11+
: "${COPILOT_CLI_MCP_ENABLED:=false}"
1212
: "${COPILOT_CLI_MCP_CONFIG_TEMPLATE:=/opt/copilot/mcp-config.json}"
1313
: "${COPILOT_CLI_MCP_CONFIG_PATH:=/root/.copilot/mcp-config.json}"
14+
: "${COPILOT_GITHUB_TOKEN:=your_github_personal_access_token_here }"
1415

1516
if [[ "${COPILOT_CLI_ENABLED}" != "true" ]]; then
1617
echo "COPILOT_CLI_ENABLED is not true; skipping Copilot CLI installation."
@@ -53,7 +54,14 @@ else
5354
echo "Copilot CLI installation finished, but 'copilot' is not on PATH." >&2
5455
fi
5556

56-
if [[ "${COPILOT_CLI_MCP_SEED}" == "true" ]]; then
57+
if [[ -n "${COPILOT_GITHUB_TOKEN}" && "${COPILOT_GITHUB_TOKEN}" != "your_github_personal_access_token_here" ]]; then
58+
echo "Logging into Copilot CLI with provided GitHub token to cache credentials..."
59+
echo "${COPILOT_GITHUB_TOKEN}" | copilot auth login --with-token || echo "Copilot CLI login failed; please check your token and login manually." >&2
60+
else
61+
echo "COPILOT_GITHUB_TOKEN is not set or is the default placeholder; skipping Copilot CLI login."
62+
fi
63+
64+
if [[ "${COPILOT_CLI_MCP_ENABLED}" == "true" ]]; then
5765
if [[ -f "${COPILOT_CLI_MCP_CONFIG_TEMPLATE}" ]]; then
5866
echo "Seeding Copilot CLI MCP config..."
5967
mkdir -p "$(dirname "${COPILOT_CLI_MCP_CONFIG_PATH}")"
@@ -62,5 +70,5 @@ if [[ "${COPILOT_CLI_MCP_SEED}" == "true" ]]; then
6270
echo "MCP config template not found at ${COPILOT_CLI_MCP_CONFIG_TEMPLATE}; skipping seed." >&2
6371
fi
6472
else
65-
echo "COPILOT_CLI_MCP_SEED is not true; skipping MCP config seed."
73+
echo "COPILOT_CLI_MCP_ENABLED is not true; skipping MCP config seed."
6674
fi

0 commit comments

Comments
 (0)