-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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.
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
docker: add Fedora 39 and openSUSE Tumbleweed based images #6669
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# syntax=docker/dockerfile:experimental | ||
|
||
ARG BASE=fedora:39 | ||
FROM scratch AS packages | ||
COPY release-packages/code-server*.rpm /tmp/ | ||
|
||
FROM $BASE | ||
|
||
RUN dnf update -y \ | ||
&& dnf install -y \ | ||
curl \ | ||
git \ | ||
git-lfs \ | ||
htop \ | ||
nano \ | ||
openssh-clients \ | ||
procps \ | ||
wget \ | ||
zsh \ | ||
dumb-init \ | ||
glibc-langpack-en \ | ||
&& rm -rf /var/cache/dnf | ||
RUN git lfs install | ||
|
||
ENV LANG=en_US.UTF-8 | ||
RUN echo 'LANG="en_US.UTF-8"' > /etc/locale.conf | ||
|
||
RUN useradd -u 1000 coder && echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd | ||
|
||
RUN ARCH="$(uname -m | sed 's/x86_64/amd64/g' | sed 's/aarch64/arm64/g')" \ | ||
&& curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - \ | ||
&& chown root:root /usr/local/bin/fixuid \ | ||
&& chmod 4755 /usr/local/bin/fixuid \ | ||
&& mkdir -p /etc/fixuid \ | ||
&& printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml | ||
|
||
COPY ci/release-image/entrypoint.sh /usr/bin/entrypoint.sh | ||
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages dnf install -y /tmp/packages/code-server*$(uname -m | sed 's/x86_64/amd64/g' | sed 's/aarch64/arm64/g').rpm | ||
|
||
# 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 | ||
|
||
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 | ||
# docker-run. | ||
USER 1000 | ||
ENV USER=coder | ||
WORKDIR /home/coder | ||
ENTRYPOINT ["/usr/bin/entrypoint.sh", "--bind-addr", "0.0.0.0:8080", "."] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# syntax=docker/dockerfile:experimental | ||
|
||
ARG BASE=opensuse/tumbleweed | ||
FROM scratch AS packages | ||
COPY release-packages/code-server*.rpm /tmp/ | ||
|
||
FROM $BASE | ||
|
||
RUN zypper dup -y \ | ||
&& zypper in -y \ | ||
curl \ | ||
git \ | ||
git-lfs \ | ||
htop \ | ||
nano \ | ||
openssh-clients \ | ||
procps \ | ||
wget \ | ||
zsh \ | ||
sudo \ | ||
catatonit \ | ||
&& rm -rf /var/cache/zypp /var/cache/zypper | ||
RUN git lfs install | ||
|
||
ENV LANG=en_US.UTF-8 | ||
RUN echo 'LANG="en_US.UTF-8"' > /etc/locale.conf | ||
|
||
RUN useradd -u 1000 coder && echo "coder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/nopasswd | ||
|
||
RUN ARCH="$(uname -m | sed 's/x86_64/amd64/g' | sed 's/aarch64/arm64/g')" \ | ||
&& curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v0.6.0/fixuid-0.6.0-linux-$ARCH.tar.gz" | tar -C /usr/local/bin -xzf - \ | ||
&& chown root:root /usr/local/bin/fixuid \ | ||
&& chmod 4755 /usr/local/bin/fixuid \ | ||
&& mkdir -p /etc/fixuid \ | ||
&& printf "user: coder\ngroup: coder\n" > /etc/fixuid/config.yml | ||
|
||
COPY ci/release-image/entrypoint-catatonit.sh /usr/bin/entrypoint-catatonit.sh | ||
RUN --mount=from=packages,src=/tmp,dst=/tmp/packages rpm -i /tmp/packages/code-server*$(uname -m | sed 's/x86_64/amd64/g' | sed 's/aarch64/arm64/g').rpm | ||
|
||
# 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 | ||
|
||
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 | ||
# docker-run. | ||
USER 1000 | ||
ENV USER=coder | ||
WORKDIR /home/coder | ||
ENTRYPOINT ["/usr/bin/entrypoint-catatonit.sh", "--bind-addr", "0.0.0.0:8080", "."] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#!/bin/sh | ||
set -eu | ||
|
||
# We do this first to ensure sudo works below when renaming the user. | ||
# Otherwise the current container UID may not exist in the passwd database. | ||
eval "$(fixuid -q)" | ||
|
||
if [ "${DOCKER_USER-}" ]; then | ||
USER="$DOCKER_USER" | ||
if [ "$DOCKER_USER" != "$(whoami)" ]; then | ||
echo "$DOCKER_USER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/nopasswd > /dev/null | ||
# Unfortunately we cannot change $HOME as we cannot move any bind mounts | ||
# nor can we bind mount $HOME into a new home as that requires a privileged container. | ||
sudo usermod --login "$DOCKER_USER" coder | ||
sudo groupmod -n "$DOCKER_USER" coder | ||
|
||
sudo sed -i "/coder/d" /etc/sudoers.d/nopasswd | ||
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 | ||
find "${ENTRYPOINTD}" -type f -executable -print -exec {} \; | ||
fi | ||
|
||
exec catatonit -- /usr/bin/code-server "$@" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.