mirror of
https://github.com/linuxserver/docker-mods.git
synced 2026-01-24 00:31:58 +08:00
Merge pull request #808 from totraku/code-server-rust
code-server: rust initial release
This commit is contained in:
aptalca
GitHub
commit
05a486bfdf
6
.github/workflows/BuildImage.yml
vendored
6
.github/workflows/BuildImage.yml
vendored
@ -5,8 +5,8 @@ on: [push, pull_request_target, workflow_dispatch]
|
||||
env:
|
||||
GITHUB_REPO: "linuxserver/docker-mods" #don't modify
|
||||
ENDPOINT: "linuxserver/mods" #don't modify
|
||||
BASEIMAGE: "replace_baseimage" #replace
|
||||
MODNAME: "replace_modname" #replace
|
||||
BASEIMAGE: "code-server"
|
||||
MODNAME: "rust"
|
||||
|
||||
jobs:
|
||||
set-vars:
|
||||
@ -20,7 +20,7 @@ jobs:
|
||||
echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
|
||||
echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
|
||||
# **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
|
||||
MOD_VERSION=""
|
||||
MOD_VERSION=$(curl -s https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name)
|
||||
echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
|
||||
outputs:
|
||||
GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}
|
||||
|
||||
23
Dockerfile
23
Dockerfile
@ -1,8 +1,25 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
|
||||
|
||||
ARG MOD_VERSION
|
||||
|
||||
RUN if [ -z "$MOD_VERSION" ]; then \
|
||||
MOD_VERSION=$(curl -s https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name); \
|
||||
fi && \
|
||||
mkdir -p /root-layer/rust-bins && \
|
||||
SUPPORTED_PLATFORMS="x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu" && \
|
||||
for PLATFORM in $SUPPORTED_PLATFORMS; do \
|
||||
ARCH=${PLATFORM%%-*}; \
|
||||
RUST_BINS=/root-layer/rust-bins/rust-${ARCH}-gnu.tar.gz; \
|
||||
RUST_BINS_URL=https://static.rust-lang.org/dist/rust-${MOD_VERSION}-${PLATFORM}.tar.gz; \
|
||||
echo "Downloading rust for $PLATFORM"; \
|
||||
curl -o $RUST_BINS -sSf $RUST_BINS_URL; \
|
||||
done;
|
||||
|
||||
COPY root/ /root-layer/
|
||||
|
||||
FROM scratch
|
||||
|
||||
LABEL maintainer="username"
|
||||
LABEL maintainer="totraku"
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
COPY --from=buildstage /root-layer/ /
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
## Buildstage ##
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
|
||||
|
||||
RUN \
|
||||
echo "**** install packages ****" && \
|
||||
apk add --no-cache \
|
||||
curl && \
|
||||
echo "**** grab rclone ****" && \
|
||||
mkdir -p /root-layer && \
|
||||
curl -o \
|
||||
/root-layer/rclone.deb -L \
|
||||
"https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"
|
||||
|
||||
# copy local files
|
||||
COPY root/ /root-layer/
|
||||
|
||||
## Single layer deployed image ##
|
||||
FROM scratch
|
||||
|
||||
LABEL maintainer="username"
|
||||
|
||||
# Add files from buildstage
|
||||
COPY --from=buildstage /root-layer/ /
|
||||
30
README.md
30
README.md
@ -1,25 +1,15 @@
|
||||
# Rsync - Docker mod for openssh-server
|
||||
# Rust - Docker mod for code-server and openvscode-server
|
||||
This mod adds Rust to code-server and openvscode-server.
|
||||
|
||||
This mod adds rsync to openssh-server, to be installed/updated during container start.
|
||||
In code-server or openvscode-server docker arguments, set an environment variable DOCKER_MODS=linuxserver/mods:code-server-rust
|
||||
|
||||
In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
|
||||
If adding multiple mods, enter them in an array separated by |, such as DOCKER_MODS=linuxserver/mods:code-server-rust|linuxserver/mods:code-server-mod2
|
||||
|
||||
If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2`
|
||||
By default, the mod will install the latest stable version of Rust. If you'd like to install a different version, you can specify the version as a tag, from a list of published tags: https://hub.docker.com/r/linuxserver/mods/tags?page=1&name=code-server-rust
|
||||
|
||||
# Mod creation instructions
|
||||
Supported architectures:
|
||||
- [x] linux/amd64
|
||||
- [x] linux/aarch64
|
||||
|
||||
* Fork the repo, create a new branch based on the branch `template`.
|
||||
* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done.
|
||||
* Inspect the `root` folder contents. Edit, add and remove as necessary.
|
||||
* After all init scripts and services are created, run `find ./ -path "./.git" -prune -o \( -name "run" -o -name "finish" -o -name "check" \) -not -perm -u=x,g=x,o=x -print -exec chmod +x {} +` to fix permissions.
|
||||
* Edit this readme with pertinent info, delete these instructions.
|
||||
* Finally edit the `.github/workflows/BuildImage.yml`. Customize the vars for `BASEIMAGE` and `MODNAME`. Set the versioning logic if needed.
|
||||
* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
|
||||
* Submit PR against the branch created by the team.
|
||||
|
||||
|
||||
## Tips and tricks
|
||||
|
||||
* Some images have helpers built in, these images are currently:
|
||||
* [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files)
|
||||
* [Code-server](https://github.com/linuxserver/docker-code-server/pull/95)
|
||||
Supported docker base images:
|
||||
- [x] ubuntu:jammy
|
||||
|
||||
34
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-rust-install/run
Executable file
34
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-rust-install/run
Executable file
@ -0,0 +1,34 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
set -e
|
||||
|
||||
RUST_BINS_PATH="/rust-bins"
|
||||
PACKAGES_TO_INSTALL_LIST="/mod-repo-packages-to-install.list"
|
||||
|
||||
ARCH=$(uname -m)
|
||||
SUPPORTED_ARCHS=("x86_64" "aarch64")
|
||||
|
||||
if [[ ! " ${SUPPORTED_ARCHS[@]} " =~ " ${ARCH} " ]]; then
|
||||
echo "**** unsupported architecture: $ARCH ****"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if ! dpkg -l | grep build-essential >/dev/null; then
|
||||
echo "**** adding build-essential to install list ****"
|
||||
echo "build-essential" >>"$PACKAGES_TO_INSTALL_LIST"
|
||||
else
|
||||
echo "**** build-essential already installed ****"
|
||||
fi
|
||||
|
||||
RUST_BINARY_ARCHIVE_PATH="$RUST_BINS_PATH/rust-$ARCH-gnu.tar.gz"
|
||||
|
||||
if [[ -f "$RUST_BINARY_ARCHIVE_PATH" ]]; then
|
||||
echo "**** unpacking rust tar ****"
|
||||
tar -xzf "$RUST_BINARY_ARCHIVE_PATH" -C "$RUST_BINS_PATH" --strip-components=1
|
||||
|
||||
echo "**** installing rust ****"
|
||||
"$RUST_BINS_PATH/install.sh"
|
||||
rm -rf "$RUST_BINS_PATH"
|
||||
else
|
||||
echo "**** latest rust is already installed ****"
|
||||
fi
|
||||
@ -0,0 +1 @@
|
||||
oneshot
|
||||
@ -0,0 +1 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-mod-code-server-rust-install/run
|
||||
@ -1,30 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
# This is the init file used for adding os or pip packages to install lists.
|
||||
# It takes advantage of the built-in init-mods-package-install init script that comes with the baseimages.
|
||||
# If using this, we need to make sure we set this init as a dependency of init-mods-package-install so this one runs first
|
||||
|
||||
if ! command -v apprise; then
|
||||
echo "**** Adding apprise and its deps to package install lists ****"
|
||||
echo "apprise" >> /mod-pip-packages-to-install.list
|
||||
## Ubuntu
|
||||
if [ -f /usr/bin/apt ]; then
|
||||
echo "\
|
||||
python3 \
|
||||
python3-pip \
|
||||
runc" >> /mod-repo-packages-to-install.list
|
||||
fi
|
||||
# Alpine
|
||||
if [ -f /sbin/apk ]; then
|
||||
echo "\
|
||||
cargo \
|
||||
libffi-dev \
|
||||
openssl-dev \
|
||||
python3 \
|
||||
python3-dev \
|
||||
python3 \
|
||||
py3-pip" >> /mod-repo-packages-to-install.list
|
||||
fi
|
||||
else
|
||||
echo "**** apprise already installed, skipping ****"
|
||||
fi
|
||||
@ -1 +0,0 @@
|
||||
oneshot
|
||||
@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run
|
||||
@ -1,8 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
# This is an install script that is designed to run after init-mods-package-install
|
||||
# so it can take advantage of packages installed
|
||||
# init-mods-end depends on this script so that later init and services wait until this script exits
|
||||
|
||||
echo "**** Setting up apprise ****"
|
||||
apprise blah blah
|
||||
@ -1 +0,0 @@
|
||||
oneshot
|
||||
@ -1 +0,0 @@
|
||||
/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run
|
||||
@ -1,7 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
# This is an example service that would run for the mod
|
||||
# It depends on init-services, the baseimage hook for start of all longrun services
|
||||
|
||||
exec \
|
||||
s6-setuidgid abc run my app
|
||||
@ -1 +0,0 @@
|
||||
longrun
|
||||
Loading…
x
Reference in New Issue
Block a user