fix: reduce permissions and fix npm and opencode versions
This commit is contained in:
+3
-5
@@ -4,6 +4,7 @@ ARG UBUNTU_VERSION=26.04
|
|||||||
FROM ubuntu:${UBUNTU_VERSION}
|
FROM ubuntu:${UBUNTU_VERSION}
|
||||||
|
|
||||||
ARG NODE_VERSION=24.21.0
|
ARG NODE_VERSION=24.21.0
|
||||||
|
ARG OPENCODE_VERSION=2.0.3
|
||||||
|
|
||||||
ARG DEV_UID=1000
|
ARG DEV_UID=1000
|
||||||
ARG DEV_GID=1000
|
ARG DEV_GID=1000
|
||||||
@@ -43,7 +44,6 @@ RUN apt-get update \
|
|||||||
python3-pip \
|
python3-pip \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
ripgrep \
|
ripgrep \
|
||||||
sudo \
|
|
||||||
tar \
|
tar \
|
||||||
tree \
|
tree \
|
||||||
unzip \
|
unzip \
|
||||||
@@ -67,9 +67,7 @@ RUN groupadd --gid "${DEV_GID}" dev \
|
|||||||
--uid "${DEV_UID}" \
|
--uid "${DEV_UID}" \
|
||||||
--gid "${DEV_GID}" \
|
--gid "${DEV_GID}" \
|
||||||
--create-home \
|
--create-home \
|
||||||
--shell /bin/bash dev \
|
--shell /bin/bash 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 \
|
||||||
@@ -81,7 +79,7 @@ RUN curl -fsSLO \
|
|||||||
&& rm "node-v${NODE_VERSION}-linux-x64.tar.xz" \
|
&& rm "node-v${NODE_VERSION}-linux-x64.tar.xz" \
|
||||||
&& echo -n "node version: " && node --version \
|
&& echo -n "node version: " && node --version \
|
||||||
&& echo -n "npm version: " && npm --version \
|
&& echo -n "npm version: " && npm --version \
|
||||||
&& npm install -g @opencode/cli \
|
&& npm install -g "@opencode/cli@${OPENCODE_VERSION}" \
|
||||||
&& echo -n "opencode version: " && opencode --version \
|
&& echo -n "opencode version: " && opencode --version \
|
||||||
&& npm cache clean --force
|
&& npm cache clean --force
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ cd "$SCRIPT_DIR"
|
|||||||
|
|
||||||
UBUNTU_VERSION="${UBUNTU_VERSION:-26.04}"
|
UBUNTU_VERSION="${UBUNTU_VERSION:-26.04}"
|
||||||
# OPENCODE_VERSION=$(curl -fsSI https://github.com/anomalyco/opencode/releases/latest | sed -n 's/^location:.*\/tag\/v\{0,1\}\(.*\)\r$/\1/ip')
|
# OPENCODE_VERSION=$(curl -fsSI https://github.com/anomalyco/opencode/releases/latest | sed -n 's/^location:.*\/tag\/v\{0,1\}\(.*\)\r$/\1/ip')
|
||||||
NODE_VERSION=$(curl -fsSL https://nodejs.org/dist/index.json | sed -n 's/.*"version":"v\([^"]*\)".*"lts":".*".*/\1/p' | head -n 1)
|
NODE_VERSION="${NODE_VERSION:-24.21.0}"
|
||||||
|
OPENCODE_VERSION="${OPENCODE_VERSION:-2.0.3}"
|
||||||
|
|
||||||
IMAGE_REPO="${IMAGE_REPO:-localhost/opencode-dev}"
|
IMAGE_REPO="${IMAGE_REPO:-localhost/opencode-dev}"
|
||||||
# IMAGE_TAG="${IMAGE_TAG:-${OPENCODE_VERSION}}"
|
# IMAGE_TAG="${IMAGE_TAG:-${OPENCODE_VERSION}}"
|
||||||
@@ -49,6 +50,7 @@ if [ ${DRY_RUN} == false ]; then
|
|||||||
"${NO_CACHE[@]}" \
|
"${NO_CACHE[@]}" \
|
||||||
--build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \
|
--build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \
|
||||||
--build-arg "NODE_VERSION=${NODE_VERSION}" \
|
--build-arg "NODE_VERSION=${NODE_VERSION}" \
|
||||||
|
--build-arg "OPENCODE_VERSION=${OPENCODE_VERSION}" \
|
||||||
--build-arg "DEV_UID=${DEV_UID}" \
|
--build-arg "DEV_UID=${DEV_UID}" \
|
||||||
--build-arg "DEV_GID=${DEV_GID}" \
|
--build-arg "DEV_GID=${DEV_GID}" \
|
||||||
-t "$IMAGE" \
|
-t "$IMAGE" \
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ M2_FOLDER="${M2_FOLDER:-$BASE_DIR/m2}"
|
|||||||
NPM_MODULES="${NPM_MODULES:-$BASE_DIR/npm-modules}"
|
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}"
|
|
||||||
BASH_FOLDER="${BASH_FOLDER:-$BASE_DIR/bash}"
|
BASH_FOLDER="${BASH_FOLDER:-$BASE_DIR/bash}"
|
||||||
|
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
@@ -31,7 +30,6 @@ mkdir -p \
|
|||||||
"$NPM_MODULES" \
|
"$NPM_MODULES" \
|
||||||
"$NPM_CACHE" \
|
"$NPM_CACHE" \
|
||||||
"$PIP_CACHE" \
|
"$PIP_CACHE" \
|
||||||
"$CERTIFICATES" \
|
|
||||||
"$BASH_FOLDER"
|
"$BASH_FOLDER"
|
||||||
|
|
||||||
if [[ ! -f "$HOME/.gitconfig" ]]; then
|
if [[ ! -f "$HOME/.gitconfig" ]]; then
|
||||||
@@ -63,7 +61,6 @@ 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
|
||||||
@@ -71,6 +68,10 @@ ARGS=(
|
|||||||
--userns=keep-id
|
--userns=keep-id
|
||||||
--network=default
|
--network=default
|
||||||
--tz=local
|
--tz=local
|
||||||
|
|
||||||
|
--security-opt=no-new-privileges
|
||||||
|
--cap-drop=ALL
|
||||||
|
|
||||||
-e "HOST_LANG=${LANG:-C.UTF-8}"
|
-e "HOST_LANG=${LANG:-C.UTF-8}"
|
||||||
-e "HOST_LC_ALL=${LC_ALL:-}"
|
-e "HOST_LC_ALL=${LC_ALL:-}"
|
||||||
-e "START_DIR=${START_DIR}"
|
-e "START_DIR=${START_DIR}"
|
||||||
@@ -81,7 +82,6 @@ ARGS=(
|
|||||||
-v "$M2_FOLDER:/home/dev/.m2:rw"
|
-v "$M2_FOLDER:/home/dev/.m2:rw"
|
||||||
-v "$NPM_CACHE:/home/dev/.npm:rw"
|
-v "$NPM_CACHE:/home/dev/.npm:rw"
|
||||||
-v "$PIP_CACHE:/home/dev/.cache/pip:rw"
|
-v "$PIP_CACHE:/home/dev/.cache/pip:rw"
|
||||||
-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"
|
||||||
|
|||||||
+23
-23
@@ -1,29 +1,29 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
CERT_DIR="${CERT_DIR:-/host-certs}"
|
# CERT_DIR="${CERT_DIR:-/host-certs}"
|
||||||
|
#
|
||||||
if [[ -d "$CERT_DIR" ]]; then
|
# if [[ -d "$CERT_DIR" ]]; then
|
||||||
shopt -s nullglob
|
# shopt -s nullglob
|
||||||
certs=("$CERT_DIR"/*.crt "$CERT_DIR"/*.pem)
|
# certs=("$CERT_DIR"/*.crt "$CERT_DIR"/*.pem)
|
||||||
if ((${#certs[@]})); then
|
# if ((${#certs[@]})); then
|
||||||
mkdir -p /usr/local/share/ca-certificates/opencode-host
|
# mkdir -p /usr/local/share/ca-certificates/opencode-host
|
||||||
for cert in "${certs[@]}"; do
|
# for cert in "${certs[@]}"; do
|
||||||
target="/usr/local/share/ca-certificates/opencode-host/$(basename "${cert%.*}").crt"
|
# target="/usr/local/share/ca-certificates/opencode-host/$(basename "${cert%.*}").crt"
|
||||||
if openssl x509 -in "$cert" -noout >/dev/null 2>&1; then
|
# if openssl x509 -in "$cert" -noout >/dev/null 2>&1; then
|
||||||
cp -f "$cert" "$target"
|
# cp -f "$cert" "$target"
|
||||||
else
|
# else
|
||||||
echo "WARNING: ignoring invalid CA certificate: $cert" >&2
|
# echo "WARNING: ignoring invalid CA certificate: $cert" >&2
|
||||||
fi
|
# fi
|
||||||
done
|
# done
|
||||||
if update-ca-certificates >/tmp/opencode-ca.log 2>&1; then
|
# if update-ca-certificates >/tmp/opencode-ca.log 2>&1; then
|
||||||
:
|
# :
|
||||||
else
|
# else
|
||||||
echo "WARNING: update-ca-certificates failed; continuing." >&2
|
# echo "WARNING: update-ca-certificates failed; continuing." >&2
|
||||||
cat /tmp/opencode-ca.log >&2 || true
|
# cat /tmp/opencode-ca.log >&2 || true
|
||||||
fi
|
# fi
|
||||||
fi
|
# fi
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
host_lang="${HOST_LANG:-${LANG:-C.UTF-8}}"
|
host_lang="${HOST_LANG:-${LANG:-C.UTF-8}}"
|
||||||
host_lc_all="${HOST_LC_ALL:-${LC_ALL:-}}"
|
host_lc_all="${HOST_LC_ALL:-${LC_ALL:-}}"
|
||||||
|
|||||||
Reference in New Issue
Block a user