Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b6bf4b6640 | |||
| c42b47bb56 | |||
| 2caa8a790f | |||
| 7a6a515b53 | |||
| 4f126a938b | |||
| 4af38a5d2e | |||
| 90350a2090 | |||
| 5b8e6a290b | |||
| e860499757 | |||
| e90a2fe553 | |||
| 897f1409b5 | |||
| 32d4fe4944 |
+20
-2
@@ -35,7 +35,25 @@ RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | gpg --dearm
|
|||||||
# Chrome wrapper: adds flags required for running inside a Docker container.
|
# Chrome wrapper: adds flags required for running inside a Docker container.
|
||||||
# xdg-open (used by Claude Code on Linux) respects $BROWSER, so pointing it
|
# xdg-open (used by Claude Code on Linux) respects $BROWSER, so pointing it
|
||||||
# here ensures the OAuth popup works without manual --no-sandbox invocations.
|
# here ensures the OAuth popup works without manual --no-sandbox invocations.
|
||||||
RUN printf '#!/bin/bash\nexec /usr/bin/google-chrome-stable \\\n --no-sandbox \\\n --disable-dev-shm-usage \\\n --disable-gpu \\\n "$@"\n' > /usr/local/bin/google-chrome && \
|
# Cleans up crash lock files and suppresses the crash-restore bubble so that
|
||||||
|
# sessions/cookies survive unclean pod shutdowns (SIGKILL).
|
||||||
|
RUN printf '#!/bin/bash\n\
|
||||||
|
CHROME_DIR="/config/userdata/.config/google-chrome"\n\
|
||||||
|
mkdir -p "$CHROME_DIR"\n\
|
||||||
|
# Remove stale lock files left by unclean container shutdown\n\
|
||||||
|
rm -f "$CHROME_DIR/SingletonLock" "$CHROME_DIR/SingletonSocket" "$CHROME_DIR/SingletonCookie"\n\
|
||||||
|
# Mark the previous session as clean so Chrome does not clear cookies\n\
|
||||||
|
PREFS="$CHROME_DIR/Default/Preferences"\n\
|
||||||
|
if [ -f "$PREFS" ]; then\n\
|
||||||
|
sed -i '\''s/"exit_type":"Crashed"/"exit_type":"Normal"/g; s/"exited_cleanly":false/"exited_cleanly":true/g'\'' "$PREFS"\n\
|
||||||
|
fi\n\
|
||||||
|
exec /usr/bin/google-chrome-stable \\\n\
|
||||||
|
--no-sandbox \\\n\
|
||||||
|
--disable-dev-shm-usage \\\n\
|
||||||
|
--disable-gpu \\\n\
|
||||||
|
--disable-session-crashed-bubble \\\n\
|
||||||
|
--user-data-dir="$CHROME_DIR" \\\n\
|
||||||
|
"$@"\n' > /usr/local/bin/google-chrome && \
|
||||||
chmod +x /usr/local/bin/google-chrome
|
chmod +x /usr/local/bin/google-chrome
|
||||||
|
|
||||||
# Install Node.js (LTS version for Happy Coder)
|
# Install Node.js (LTS version for Happy Coder)
|
||||||
@@ -93,7 +111,7 @@ COPY --chmod=755 scripts/cont-init-sshd.sh /etc/cont-init.d/25-start-sshd.sh
|
|||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
# Configure container to run as user user
|
# Configure container to run as user user
|
||||||
ENV HOME=/home/user \
|
ENV HOME=/config/userdata \
|
||||||
USER=user \
|
USER=user \
|
||||||
BROWSER=/usr/local/bin/google-chrome
|
BROWSER=/usr/local/bin/google-chrome
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2,5 +2,5 @@ apiVersion: v2
|
|||||||
name: devcontainer
|
name: devcontainer
|
||||||
description: Antigravity Dev Container with Happy Coder AI assistant
|
description: Antigravity Dev Container with Happy Coder AI assistant
|
||||||
type: application
|
type: application
|
||||||
version: 0.1.6
|
version: 0.1.13
|
||||||
appVersion: "latest"
|
appVersion: "latest"
|
||||||
|
|||||||
@@ -68,9 +68,11 @@ spec:
|
|||||||
{{- toYaml .Values.resources | nindent 12 }}
|
{{- toYaml .Values.resources | nindent 12 }}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: userhome
|
- name: userhome
|
||||||
mountPath: /home
|
mountPath: /config
|
||||||
- name: workspace
|
- name: workspace
|
||||||
mountPath: /workspace
|
mountPath: /workspace
|
||||||
|
- name: shm
|
||||||
|
mountPath: /dev/shm
|
||||||
{{- if ne (.Values.ide | default "vscode") "none" }}
|
{{- if ne (.Values.ide | default "vscode") "none" }}
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
@@ -99,6 +101,10 @@ spec:
|
|||||||
volumes:
|
volumes:
|
||||||
- name: workspace
|
- name: workspace
|
||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
|
- name: shm
|
||||||
|
emptyDir:
|
||||||
|
medium: Memory
|
||||||
|
sizeLimit: {{ .Values.shm.sizeLimit }}
|
||||||
- name: userhome
|
- name: userhome
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: {{ include "antigravity.pvcName" . }}
|
claimName: {{ include "antigravity.pvcName" . }}
|
||||||
|
|||||||
+6
-1
@@ -23,7 +23,7 @@ ssh: false
|
|||||||
# Happy Coder endpoints
|
# Happy Coder endpoints
|
||||||
happyServerUrl: "https://happy.farh.net"
|
happyServerUrl: "https://happy.farh.net"
|
||||||
happyWebappUrl: "https://happy-coder.farh.net"
|
happyWebappUrl: "https://happy-coder.farh.net"
|
||||||
happyHomeDir: "/home/user/.happy"
|
happyHomeDir: "/config/userdata/.happy"
|
||||||
happyExperimental: "true"
|
happyExperimental: "true"
|
||||||
|
|
||||||
# VNC display
|
# VNC display
|
||||||
@@ -41,6 +41,11 @@ storage:
|
|||||||
size: 32Gi
|
size: 32Gi
|
||||||
className: ceph-filesystem
|
className: ceph-filesystem
|
||||||
|
|
||||||
|
# Shared memory size — mounted at /dev/shm as a memory-backed emptyDir.
|
||||||
|
# Electron apps (Antigravity, Chrome) use /dev/shm for GPU/IPC buffers.
|
||||||
|
shm:
|
||||||
|
sizeLimit: 2Gi
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
memory: "2Gi"
|
memory: "2Gi"
|
||||||
|
|||||||
@@ -5,12 +5,30 @@
|
|||||||
|
|
||||||
echo "=== SSH enabled: starting sshd ==="
|
echo "=== SSH enabled: starting sshd ==="
|
||||||
|
|
||||||
# Generate host keys if missing (first boot or ephemeral /etc/ssh)
|
HOME_DIR="/config/userdata"
|
||||||
ssh-keygen -A 2>/dev/null || true
|
HOST_KEY_STORE="$HOME_DIR/.ssh/host_keys"
|
||||||
|
|
||||||
|
# Persist host keys on the home PVC so clients don't see a "host key
|
||||||
|
# changed" warning after pod restarts.
|
||||||
|
if [ -d "$HOST_KEY_STORE" ] && [ -n "$(ls "$HOST_KEY_STORE"/ssh_host_* 2>/dev/null)" ]; then
|
||||||
|
# Restore previously generated host keys
|
||||||
|
echo "Restoring SSH host keys from PVC..."
|
||||||
|
cp "$HOST_KEY_STORE"/ssh_host_* /etc/ssh/
|
||||||
|
chmod 600 /etc/ssh/ssh_host_*_key
|
||||||
|
chmod 644 /etc/ssh/ssh_host_*_key.pub
|
||||||
|
else
|
||||||
|
# First boot: generate and save host keys to PVC
|
||||||
|
echo "Generating SSH host keys (first boot)..."
|
||||||
|
ssh-keygen -A 2>/dev/null || true
|
||||||
|
mkdir -p "$HOST_KEY_STORE"
|
||||||
|
cp /etc/ssh/ssh_host_* "$HOST_KEY_STORE/"
|
||||||
|
chmod 700 "$HOST_KEY_STORE"
|
||||||
|
chown -R 1000:1000 "$HOST_KEY_STORE"
|
||||||
|
echo "SSH host keys saved to PVC."
|
||||||
|
fi
|
||||||
|
|
||||||
# Populate authorized_keys from env var (injected via Kubernetes secret)
|
# Populate authorized_keys from env var (injected via Kubernetes secret)
|
||||||
if [ -n "$SSH_AUTHORIZED_KEYS" ]; then
|
if [ -n "$SSH_AUTHORIZED_KEYS" ]; then
|
||||||
HOME_DIR="/home/user"
|
|
||||||
mkdir -p "$HOME_DIR/.ssh"
|
mkdir -p "$HOME_DIR/.ssh"
|
||||||
chmod 700 "$HOME_DIR/.ssh"
|
chmod 700 "$HOME_DIR/.ssh"
|
||||||
printf '%s\n' "$SSH_AUTHORIZED_KEYS" > "$HOME_DIR/.ssh/authorized_keys"
|
printf '%s\n' "$SSH_AUTHORIZED_KEYS" > "$HOME_DIR/.ssh/authorized_keys"
|
||||||
|
|||||||
@@ -3,4 +3,4 @@
|
|||||||
# baseimage-gui sets shell=/sbin/nologin and home=/dev/null, which
|
# baseimage-gui sets shell=/sbin/nologin and home=/dev/null, which
|
||||||
# prevents VSCode from opening terminals.
|
# prevents VSCode from opening terminals.
|
||||||
usermod -s /bin/bash app
|
usermod -s /bin/bash app
|
||||||
usermod -d /home/user app
|
usermod -d /config/userdata app
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ else
|
|||||||
# Configure git to use token if provided
|
# Configure git to use token if provided
|
||||||
if [ -n "$GITHUB_TOKEN" ]; then
|
if [ -n "$GITHUB_TOKEN" ]; then
|
||||||
git config credential.helper store
|
git config credential.helper store
|
||||||
echo "https://oauth2:${GITHUB_TOKEN}@github.com" > /home/.git-credentials
|
echo "https://oauth2:${GITHUB_TOKEN}@github.com" > /config/userdata/.git-credentials
|
||||||
chmod 600 /home/.git-credentials
|
chmod 600 /config/userdata/.git-credentials
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git pull || echo "Pull failed, continuing anyway..."
|
git pull || echo "Pull failed, continuing anyway..."
|
||||||
@@ -42,8 +42,8 @@ else
|
|||||||
|
|
||||||
# Configure credentials for future use
|
# Configure credentials for future use
|
||||||
git config --global credential.helper store
|
git config --global credential.helper store
|
||||||
echo "https://oauth2:${GITHUB_TOKEN}@github.com" > /home/.git-credentials
|
echo "https://oauth2:${GITHUB_TOKEN}@github.com" > /config/userdata/.git-credentials
|
||||||
chmod 600 /home/.git-credentials
|
chmod 600 /config/userdata/.git-credentials
|
||||||
else
|
else
|
||||||
git clone "$GITHUB_REPO" "$WORKSPACE_DIR"
|
git clone "$GITHUB_REPO" "$WORKSPACE_DIR"
|
||||||
fi
|
fi
|
||||||
|
|||||||
+7
-1
@@ -21,7 +21,13 @@ echo "Workspace: $WORKSPACE_DIR"
|
|||||||
case "$IDE" in
|
case "$IDE" in
|
||||||
antigravity)
|
antigravity)
|
||||||
echo "Opening Google Antigravity in: $WORKSPACE_DIR"
|
echo "Opening Google Antigravity in: $WORKSPACE_DIR"
|
||||||
exec antigravity --new-window --wait "$WORKSPACE_DIR"
|
# --no-sandbox is required for Electron apps in Docker (no kernel sandbox available).
|
||||||
|
# Explicit --user-data-dir and --extensions-dir pin config to the home PVC so
|
||||||
|
# settings and the setup wizard state survive pod restarts.
|
||||||
|
exec antigravity --no-sandbox \
|
||||||
|
--user-data-dir "$HOME/.config/antigravity" \
|
||||||
|
--extensions-dir "$HOME/.antigravity/extensions" \
|
||||||
|
--new-window --wait "$WORKSPACE_DIR"
|
||||||
;;
|
;;
|
||||||
none)
|
none)
|
||||||
echo "IDE=none: no IDE launched, keeping container alive."
|
echo "IDE=none: no IDE launched, keeping container alive."
|
||||||
|
|||||||
Reference in New Issue
Block a user