-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
docker: add Fedora 39 and openSUSE Tumbleweed based images (#6669)
- Loading branch information
Showing
5 changed files
with
164 additions
and
1 deletion.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -183,14 +183,22 @@ jobs: | |
TAG="${{ github.event.inputs.version || github.ref_name }}" | ||
echo "VERSION=${TAG#v}" >> $GITHUB_ENV | ||
- name: Download release artifacts | ||
- name: Download deb artifacts | ||
uses: robinraju/[email protected] | ||
with: | ||
repository: "coder/code-server" | ||
tag: v${{ env.VERSION }} | ||
fileName: "*.deb" | ||
out-file-path: "release-packages" | ||
|
||
- name: Download rpm artifacts | ||
uses: robinraju/[email protected] | ||
with: | ||
repository: "coder/code-server" | ||
tag: v${{ env.VERSION }} | ||
fileName: "*.rpm" | ||
out-file-path: "release-packages" | ||
|
||
- name: Publish to Docker | ||
run: ./ci/steps/docker-buildx-push.sh | ||
env: | ||
|
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 "$@" |