Skip to content

Commit

Permalink
chore: define user directory for binaries
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Obuchowicz <[email protected]>
  • Loading branch information
AObuchow committed Nov 13, 2023
1 parent f828577 commit afb8dfe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 4 additions & 2 deletions devspaces-udi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ ENV \
JAVA_HOME_8=/usr/lib/jvm/java-1.8.0-openjdk \
JAVA_HOME="/home/tooling/.java/current" \
GOBIN="/home/tooling/go/bin/" \
PATH="/home/tooling/.local/bin:/home/tooling/.java/current/bin:/home/tooling/node_modules/.bin/:/home/tooling/.npm-global/bin/:/opt/app-root/src/.npm-global/bin/:/usr/share/maven/bin:/usr/bin:/home/tooling/go/bin:${PATH:-/bin:/usr/bin}" \
PATH="/home/user/.local/bin:/home/tooling/.local/bin:/home/tooling/.java/current/bin:/home/tooling/node_modules/.bin/:/home/tooling/.npm-global/bin/:/opt/app-root/src/.npm-global/bin/:/usr/share/maven/bin:/usr/bin:/home/tooling/go/bin:${PATH:-/bin:/usr/bin}" \
MANPATH="/usr/share/man:${MANPATH}" \
JAVACONFDIRS="/etc/java${JAVACONFDIRS:+:}${JAVACONFDIRS:-}" \
XDG_CONFIG_DIRS="/etc/xdg:${XDG_CONFIG_DIRS:-/etc/xdg}" \
Expand Down Expand Up @@ -194,7 +194,9 @@ RUN \
> ${HOME}/passwd.template && \
cat /etc/group | \
sed s#root:x:0:#root:x:0:0,\${USER_ID}:#g \
> ${HOME}/group.template
> ${HOME}/group.template && \
# Define user directory for binaries
mkdir -p /home/tooling/.local/bin

RUN \
## Rootless podman install #2: install podman buildah skopeo e2fsprogs (above)
Expand Down
2 changes: 0 additions & 2 deletions devspaces-udi/etc/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ if [[ "${KUBEDOCK_ENABLED:-false}" == "true" ]]; then

echo "Replacing podman with podman-wrapper.sh..."

mkdir -p /home/tooling/.local/bin/
ln -f -s /usr/bin/podman-wrapper.sh /home/tooling/.local/bin/podman

export TESTCONTAINERS_RYUK_DISABLED="true"
Expand All @@ -115,7 +114,6 @@ else
echo "Kubedock is disabled. It can be enabled with the env variable \"KUBEDOCK_ENABLED=true\""
echo "set in the workspace Devfile or in a Kubernetes ConfigMap in the developer namespace."
echo
mkdir -p /home/tooling/.local/bin/
ln -f -s /usr/bin/podman.orig /home/tooling/.local/bin/podman
fi

Expand Down

0 comments on commit afb8dfe

Please sign in to comment.