Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-07-18 16:58:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

rust: switch to multi-arch

Browse Source
This commit is contained in:
aptalca
2024-02-14 20:36:23 -05:00
parent 05a486bfdf
commit 1a02d2faf9
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/BuildImage.yml
+4
View File
@@ -7,6 +7,7 @@ env:
ENDPOINT: "linuxserver/mods" #don't modify ENDPOINT: "linuxserver/mods" #don't modify
BASEIMAGE: "code-server" BASEIMAGE: "code-server"
MODNAME: "rust" MODNAME: "rust"
MULTI_ARCH: "true" #set to true if needed
jobs: jobs:
set-vars: set-vars:
@@ -19,6 +20,7 @@ jobs:
echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT
echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
echo "MULTI_ARCH=${{ env.MULTI_ARCH }}" >> $GITHUB_OUTPUT
# **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. **** # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
MOD_VERSION=$(curl -s https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name) 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 echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
@@ -27,6 +29,7 @@ jobs:
ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }} ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }}
BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }} BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }}
MODNAME: ${{ steps.outputs.outputs.MODNAME }} MODNAME: ${{ steps.outputs.outputs.MODNAME }}
MULTI_ARCH: ${{ steps.outputs.outputs.MULTI_ARCH }}
MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }} MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }}
build: build:
@@ -42,4 +45,5 @@ jobs:
ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }} ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }}
BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }} BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }}
MODNAME: ${{ needs.set-vars.outputs.MODNAME }} MODNAME: ${{ needs.set-vars.outputs.MODNAME }}
MULTI_ARCH: ${{ needs.set-vars.outputs.MULTI_ARCH }}
MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }} MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }}
Dockerfile
+14 -9
View File
@@ -3,18 +3,23 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
ARG MOD_VERSION ARG MOD_VERSION
RUN if [ -z "$MOD_VERSION" ]; then \ RUN \
echo "**** Retrieving rust version ****" && \
if [ -z "$MOD_VERSION" ]; then \
MOD_VERSION=$(curl -s https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name); \ MOD_VERSION=$(curl -s https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name); \
fi && \ fi && \
mkdir -p /root-layer/rust-bins && \ mkdir -p /root-layer/rust-bins && \
SUPPORTED_PLATFORMS="x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu" && \ if [ $(uname -m) = "x86_64" ]; then \
for PLATFORM in $SUPPORTED_PLATFORMS; do \ echo "**** Downloading x86_64 tarball ****" && \
ARCH=${PLATFORM%%-*}; \ curl -fo \
RUST_BINS=/root-layer/rust-bins/rust-${ARCH}-gnu.tar.gz; \ /root-layer/rust-bins/rust.tar.gz -L \
RUST_BINS_URL=https://static.rust-lang.org/dist/rust-${MOD_VERSION}-${PLATFORM}.tar.gz; \ "https://static.rust-lang.org/dist/rust-${MOD_VERSION}-x86_64-unknown-linux-gnu.tar.gz"; \
echo "Downloading rust for $PLATFORM"; \ elif [ $(uname -m) = "aarch64" ]; then \
curl -o $RUST_BINS -sSf $RUST_BINS_URL; \ echo "**** Downloading aarch64 tarball ****" && \
done; curl -fo \
/root-layer/rust-bins/rust.tar.gz -L \
"https://static.rust-lang.org/dist/rust-${MOD_VERSION}-aarch64-unknown-linux-gnu.tar.gz"; \
fi
COPY root/ /root-layer/ COPY root/ /root-layer/
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-rust-install/run
+8 -16
View File
@@ -2,33 +2,25 @@
set -e set -e
RUST_BINS_PATH="/rust-bins"
PACKAGES_TO_INSTALL_LIST="/mod-repo-packages-to-install.list"
ARCH=$(uname -m) ARCH=$(uname -m)
SUPPORTED_ARCHS=("x86_64" "aarch64") if [[ "${ARCH}" = "armv7l" ]]; then
echo "**** The docker mods no longer support arm32v7/armhf per https://info.linuxserver.io/issues/2023-07-01-armhf/ ****"
if [[ ! " ${SUPPORTED_ARCHS[@]} " =~ " ${ARCH} " ]]; then exit 0
echo "**** unsupported architecture: $ARCH ****"
exit 1
fi fi
if ! dpkg -l | grep build-essential >/dev/null; then if ! dpkg -l | grep build-essential >/dev/null; then
echo "**** adding build-essential to install list ****" echo "**** adding build-essential to install list ****"
echo "build-essential" >>"$PACKAGES_TO_INSTALL_LIST" echo "build-essential" >> /mod-repo-packages-to-install.list
else else
echo "**** build-essential already installed ****" echo "**** build-essential already installed ****"
fi fi
RUST_BINARY_ARCHIVE_PATH="$RUST_BINS_PATH/rust-$ARCH-gnu.tar.gz" if [[ -f /rust-bins/rust.tar.gz ]]; then
if [[ -f "$RUST_BINARY_ARCHIVE_PATH" ]]; then
echo "**** unpacking rust tar ****" echo "**** unpacking rust tar ****"
tar -xzf "$RUST_BINARY_ARCHIVE_PATH" -C "$RUST_BINS_PATH" --strip-components=1 tar -xzf /rust-bins/rust.tar.gz -C /rust-bins --strip-components=1
echo "**** installing rust ****" echo "**** installing rust ****"
"$RUST_BINS_PATH/install.sh" /rust-bins/install.sh
rm -rf "$RUST_BINS_PATH" rm -rf /rust-bins/rust.tar.gz
else else
echo "**** latest rust is already installed ****" echo "**** latest rust is already installed ****"
fi fi