h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-27 16:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

cirrus: update alpine, make jammy use rustup to get Rust>=1.85

Browse Source 
See https://github.com/fish-shell/fish-shell/pull/11961#discussion_r2439033959

I didn't find a good way to add ~/.cargo/bin to $PATH only for
fishuser, so hardcode it for all users for now.  The default rustup
behavior (source it in ~/.bashrc) only works for interactive shells,
so it doesn't work in CI.

I updated the images manually for now, because
I'm not sure I want to test on master (see
https://github.com/fish-shell/fish-shell/pull/11884 and
https://github.com/fish-shell/fish-shell/pull/11961#discussion_r2439033959)

	sed -i '/if: github.repository_owner/d' .github/workflows/build_docker_images.yml
	git commit
	# Upload new docker images.
	repo_owner=krobelus
	git push $repo_owner HEAD:tmp
	gh --repo=$repo_owner/fish-shell \
	    workflow run --ref=tmp \
	    .github/workflows/build_docker_images.yml
	# https://github.com/$repo_owner/fish-shell/actions/workflows/build_docker_images.yml
	sleep 3m
	# Enable Cirrus CI on fork.
	sed -i "s/OWNER == 'fish-shell'/OWNER == '$repo_owner'/g" .cirrus.yml
	git commit
	git push $repo_owner HEAD:tmp

Part of #11961
This commit is contained in:
Johannes Altmanninger
2025-10-17 00:27:03 +02:00
parent 73fe50f6b1
commit 16f2135976
8 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/alpine.Dockerfile
View File

@@ -1,4 +1,4 @@
FROM alpine:3.19
FROM alpine:3.22
LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
ENV LANG=C.UTF-8

6
docker/focal-32bit.Dockerfile
View File

@@ -34,7 +34,8 @@ USER fishuser
WORKDIR /home/fishuser
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
&& sh /tmp/rustup.sh -y --default-toolchain nightly --component rust-src
&& sh /tmp/rustup.sh -y --no-modify-path --default-toolchain nightly --component rust-src
ENV PATH=/home/fishuser/.cargo/bin:$PATH
COPY fish_run_tests.sh /
@@ -45,6 +46,5 @@ ENV \
ENV FISH_CHECK_LINT=false
CMD . ~/.cargo/env \
&& rustup target add ${FISH_CHECK_TARGET_TRIPLE} \
CMD rustup target add ${FISH_CHECK_TARGET_TRIPLE} \
&& /fish_run_tests.sh

6
docker/jammy-asan.Dockerfile
View File

@@ -36,7 +36,8 @@ USER fishuser
WORKDIR /home/fishuser
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
&& sh /tmp/rustup.sh -y --default-toolchain nightly --component rust-src
&& sh /tmp/rustup.sh -y --no-modify-path --default-toolchain nightly --component rust-src
ENV PATH=/home/fishuser/.cargo/bin:$PATH
COPY fish_run_tests.sh /
@@ -54,6 +55,5 @@ ENV \
ENV FISH_CHECK_LINT=false
CMD . ~/.cargo/env \
&& ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-$(cat /.llvm-version) \
CMD ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-$(cat /.llvm-version) \
&& /fish_run_tests.sh

5
docker/jammy-tsan.Dockerfile
View File

@@ -33,7 +33,8 @@ USER fishuser
WORKDIR /home/fishuser
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
&& sh /tmp/rustup.sh -y --default-toolchain nightly --component rust-src
&& sh /tmp/rustup.sh -y --no-modify-path --default-toolchain nightly --component rust-src
ENV PATH=/home/fishuser/.cargo/bin:$PATH
COPY fish_run_tests.sh /
@@ -47,4 +48,4 @@ ENV \
ENV FISH_CHECK_LINT=false
CMD . ~/.cargo/env && /fish_run_tests.sh
CMD /fish_run_tests.sh

7
docker/noble.Dockerfile
View File

@@ -18,7 +18,6 @@ RUN apt-get update \
python3 \
python3-pexpect \
tmux \
rustc \
sudo \
&& locale-gen en_US.UTF-8 \
&& apt-get clean
@@ -34,11 +33,11 @@ USER fishuser
WORKDIR /home/fishuser
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
&& sh /tmp/rustup.sh -y --default-toolchain 1.75
&& sh /tmp/rustup.sh -y --no-modify-path --default-toolchain 1.75
ENV PATH=/home/fishuser/.cargo/bin:$PATH
COPY fish_run_tests.sh /
ENV FISH_CHECK_LINT=false
CMD . ~/.cargo/env \
&& /fish_run_tests.sh
CMD /fish_run_tests.sh

46
docker/ubuntu-oldest-supported.Dockerfile Normal file
View File

@@ -0,0 +1,46 @@
FROM ubuntu:22.04
LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
RUN apt-get update \
&& apt-get -y install --no-install-recommends \
cmake ninja-build \
build-essential \
ca-certificates \
clang \
curl \
gettext \
git \
libpcre2-dev \
locales \
openssl \
python3 \
python3-pexpect \
sudo \
tmux \
&& locale-gen en_US.UTF-8 \
&& apt-get clean
RUN groupadd -g 1000 fishuser \
&& useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
&& adduser fishuser sudo \
&& mkdir -p /home/fishuser/fish-build \
&& mkdir /fish-source \
&& chown -R fishuser:fishuser /home/fishuser /fish-source
USER fishuser
WORKDIR /home/fishuser
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
&& sh /tmp/rustup.sh -y --no-modify-path
ENV PATH=/home/fishuser/.cargo/bin:$PATH
RUN echo $PATH
COPY fish_run_tests.sh /
ENV FISH_CHECK_LINT=false
CMD /fish_run_tests.sh