Compare commits

...

3 Commits

Author SHA1 Message Date
Ian c64bbe5336 chore: removed commented code 2026-10-01 22:47:01 +02:00
Ian dcf5d7c08a feat: add npm modules host folder and removed shh host link 2026-10-01 22:46:36 +02:00
Ian 550bace267 feat: add sudo command and ca-certificates to install during container
build
2026-10-01 22:45:45 +02:00
3 changed files with 18 additions and 24 deletions
+8 -3
View File
@@ -43,6 +43,7 @@ RUN apt-get update \
python3-pip \ python3-pip \
python3-venv \ python3-venv \
ripgrep \ ripgrep \
sudo \
tar \ tar \
tree \ tree \
unzip \ unzip \
@@ -54,17 +55,21 @@ RUN apt-get update \
&& update-alternatives --set javac /usr/lib/jvm/java-17-openjdk-amd64/bin/javac \ && update-alternatives --set javac /usr/lib/jvm/java-17-openjdk-amd64/bin/javac \
# && rm -rf /var/lib/apt/lists/* # && rm -rf /var/lib/apt/lists/*
&& echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \ && echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen \
&& echo 'root:admin' | chpasswd \
&& locale-gen && locale-gen
COPY ./certs /usr/local/share/ca-certificates
RUN update-ca-certificates
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt
# Runtime user # Runtime user
RUN groupadd --gid "${DEV_GID}" dev \ RUN groupadd --gid "${DEV_GID}" dev \
&& useradd \ && useradd \
--uid "${DEV_UID}" \ --uid "${DEV_UID}" \
--gid "${DEV_GID}" \ --gid "${DEV_GID}" \
--create-home \ --create-home \
--shell /bin/bash \ --shell /bin/bash dev \
dev && echo 'dev ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/dev \
&& chmod 0440 /etc/sudoers.d/dev
# Node.js + OpenCode # Node.js + OpenCode
RUN curl -fsSLO \ RUN curl -fsSLO \
+10 -19
View File
@@ -2,7 +2,6 @@
set -euo pipefail set -euo pipefail
SCRIPT_DIR=$(realpath -- "$(dirname -- "${BASH_SOURCE[0]}")") SCRIPT_DIR=$(realpath -- "$(dirname -- "${BASH_SOURCE[0]}")")
echo "Script dir: ${SCRIPT_DIR}"
BASE_DIR="${OPENCODE_DEV_HOME:-$HOME/opencode-dev}" BASE_DIR="${OPENCODE_DEV_HOME:-$HOME/opencode-dev}"
IMAGE_REPO="${IMAGE_REPO:-localhost/opencode-dev}" IMAGE_REPO="${IMAGE_REPO:-localhost/opencode-dev}"
@@ -16,6 +15,7 @@ OPC_CONFIG="${OPENCODE_CONFIG:-$BASE_DIR/opencode-config}"
OPC_DATA="${OPENCODE_SHARE_DATA:-$BASE_DIR/opencode-data}" OPC_DATA="${OPENCODE_SHARE_DATA:-$BASE_DIR/opencode-data}"
OPC_CACHE="${OPENCODE_CACHE:-$BASE_DIR/opencode-cache}" OPC_CACHE="${OPENCODE_CACHE:-$BASE_DIR/opencode-cache}"
M2_FOLDER="${M2_FOLDER:-$BASE_DIR/m2}" M2_FOLDER="${M2_FOLDER:-$BASE_DIR/m2}"
NPM_MODULES="${NPM_MODULES:-$BASE_DIR/npm-modules}"
NPM_CACHE="${NPM_CACHE:-$BASE_DIR/npm-cache}" NPM_CACHE="${NPM_CACHE:-$BASE_DIR/npm-cache}"
PIP_CACHE="${PIP_CACHE:-$BASE_DIR/pip-cache}" PIP_CACHE="${PIP_CACHE:-$BASE_DIR/pip-cache}"
CERTIFICATES="${CERTIFICATES:-$BASE_DIR/certs}" CERTIFICATES="${CERTIFICATES:-$BASE_DIR/certs}"
@@ -28,13 +28,12 @@ mkdir -p \
"$OPC_DATA" \ "$OPC_DATA" \
"$OPC_CACHE" \ "$OPC_CACHE" \
"$M2_FOLDER" \ "$M2_FOLDER" \
"$NPM_MODULES" \
"$NPM_CACHE" \ "$NPM_CACHE" \
"$PIP_CACHE" \ "$PIP_CACHE" \
"$CERTIFICATES" \ "$CERTIFICATES" \
"$BASH_FOLDER" "$BASH_FOLDER"
# chmod -R 777 "$BASE_DIR"
if [[ ! -f "$HOME/.gitconfig" ]]; then if [[ ! -f "$HOME/.gitconfig" ]]; then
echo "WARNING: $HOME/.gitconfig does not exist; Git will use container defaults." >&2 echo "WARNING: $HOME/.gitconfig does not exist; Git will use container defaults." >&2
fi fi
@@ -64,12 +63,12 @@ if [[ ! -d "$PROJECTS_DIR" ]]; then
exit 1 exit 1
fi fi
# --security-opt=no-new-privileges
ARGS=( ARGS=(
run --rm -it run --rm -it
--name opencode-dev --name opencode-dev
--user dev --user dev
--userns=keep-id --userns=keep-id
--security-opt=no-new-privileges
--network=default --network=default
--tz=local --tz=local
-e "HOST_LANG=${LANG:-C.UTF-8}" -e "HOST_LANG=${LANG:-C.UTF-8}"
@@ -85,17 +84,17 @@ ARGS=(
-v "$CERTIFICATES:/host-certs:ro" -v "$CERTIFICATES:/host-certs:ro"
-v "$PROJECTS_DIR:/workspace:rw" -v "$PROJECTS_DIR:/workspace:rw"
-v "$HOME/.gitconfig:/home/dev/.gitconfig:ro" -v "$HOME/.gitconfig:/home/dev/.gitconfig:ro"
-v "$HOME/.ssh:/home/dev/.ssh:ro" # -v "$HOME/.ssh:/home/dev/.ssh:ro"
-v "$BASH_FOLDER:/host-bash:ro" -v "$BASH_FOLDER:/host-bash:ro"
-v "$SCRIPT_DIR/entrypoint.sh:/usr/local/bin/opencode-dev-entrypoint:ro" -v "$SCRIPT_DIR/entrypoint.sh:/usr/local/bin/opencode-dev-entrypoint:ro"
) )
if [[ -n "${SSH_AUTH_SOCK:-}" && -S "$SSH_AUTH_SOCK" ]]; then # if [[ -n "${SSH_AUTH_SOCK:-}" && -S "$SSH_AUTH_SOCK" ]]; then
ARGS+=( # ARGS+=(
-e SSH_AUTH_SOCK=/tmp/ssh-agent.sock # -e SSH_AUTH_SOCK=/tmp/ssh-agent.sock
-v "$SSH_AUTH_SOCK:/tmp/ssh-agent.sock" # -v "$SSH_AUTH_SOCK:/tmp/ssh-agent.sock"
) # )
fi # fi
# Additional bind mounts: # Additional bind mounts:
# ./dev.sh /project --mount "$HOME/other:/extra" # ./dev.sh /project --mount "$HOME/other:/extra"
@@ -113,12 +112,4 @@ while (($#)); do
esac esac
done done
# Load user Bash configuration after the image defaults, without persisting history.
BASH_RC="${BASE_DIR}/bash/bashrc"
if [[ -f "$BASH_RC" ]]; then
ARGS+=(-e BASH_ENV=/host-bash/bashrc)
fi
echo "Calling with args: ${ARGS[@]}"
exec podman "${ARGS[@]}" "$IMAGE" bash exec podman "${ARGS[@]}" "$IMAGE" bash
-2
View File
@@ -49,8 +49,6 @@ if [[ -n "$host_lc_all" ]]; then
export LC_ALL="$host_lc_all" export LC_ALL="$host_lc_all"
fi fi
# The image entrypoint is root only for one-time runtime setup; the shell/OpenCode
# process itself always runs as the unprivileged dev user.
# exec su -s /bin/bash dev -c 'cd "${START_DIR:-/workspace}" && exec "$@"' -- "$@" # exec su -s /bin/bash dev -c 'cd "${START_DIR:-/workspace}" && exec "$@"' -- "$@"
cd "${START_DIR:-/workspace}" cd "${START_DIR:-/workspace}"
exec "$@" exec "$@"