Skip to content

Allow user Entrypoint scripts #5194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsjoeio merged 9 commits into from
May 11, 2022
Merged

Allow user Entrypoint scripts #5194

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40f072a
Allow user Entrypoint scripts
djarbz May 11, 2022
de38960
Variable encapsulation
djarbz May 11, 2022
ea578b8
Check if Entrypoint Dir exists & run all executable
djarbz May 11, 2022
459efc0
Don't create entrypoint.d by default
djarbz May 11, 2022
5ca347f
yarn fmt
djarbz May 11, 2022
b112c9e
yarn fmt
djarbz May 11, 2022
b4e8878
Fix for SC2044
djarbz May 11, 2022
d21a1da
Revert "yarn fmt"
djarbz May 11, 2022
c724078
Merge branch 'main' into main
djarbz May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ci/release-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ RUN ARCH="$(dpkg --print-architecture)" && \
COPY ci/release-image/entrypoint.sh /usr/bin/entrypoint.sh
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages dpkg -i /tmp/packages/code-server*$(dpkg --print-architecture).deb

# Allow users to have scripts run on container startup to prepare workspace.
# https://github.com/coder/code-server/issues/5177
ENV ENTRYPOINTD=${HOME}/entrypoint.d
Copy link
Member

@code-asher code-asher May 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

RUN mkdir -p ${ENTRYPOINTD}

EXPOSE 8080
# This way, if someone sets $DOCKER_USER, docker-exec will still work as
# the uid will remain the same. note: only relevant if -u isn't passed to
Expand Down
9 changes: 9 additions & 0 deletions ci/release-image/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,13 @@ if [ "${DOCKER_USER-}" ]; then
fi
fi

# Allow users to have scripts run on container startup to prepare workspace.
# https://github.com/coder/code-server/issues/5177
if [ -d "${ENTRYPOINTD}" ]; then
for f in $(find "${ENTRYPOINTD}" -type f -executable); do
Copy link
Member

@code-asher code-asher May 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooo this is slick, I like it.

echo "Running Entrypoint: ${f}"
"${f}"
done
fi

exec dumb-init /usr/bin/code-server "$@"