Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Install newer rust version #1145

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Install newer rust version #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9574f3a
Install newer rust version
mthalman Jul 23, 2024
ce524c3
Include community repository
mthalman Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/alpine/3.17/helix/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,21 @@ RUN apk add --upgrade --no-cache \

# Install Helix Dependencies
RUN apk add --upgrade --no-cache \
cargo \
libffi-dev \
linux-headers \
python3-dev \
openssl-dev && \
ln -sf /usr/bin/python3 /usr/bin/python && \
\
# We need to install a 1.65.0+ version of rust due to cryptography-openssl dependency. This isn't available from Alpine 3.17 so we'll
# configure package install to target 3.18.
echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" >> /etc/apk/repositories && \
echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories && \
apk update && \
apk add --no-cache \
cargo && \
sed -i '/v3.18/d' /etc/apk/repositories && \
\
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
pip install ./helix_scripts-*-py3-none-any.whl && \
apk del \
Expand Down
6 changes: 5 additions & 1 deletion src/debian/12/helix/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,18 @@ RUN apt-get update && \
python3-dev \
python3-pip \
python3-venv \
rustc \
software-properties-common \
sudo \
tzdata \
unzip \
&& rm -rf /var/lib/apt/lists/* \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

# Install latest version of rust because the package version provided by Debian is too old.
# Need 1.65.0+ to install the Helix scripts due to cryptography-openssl dependency.
RUN curl -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"

ENV LANG=en_US.utf8

RUN ln -sf /usr/bin/python3 /usr/bin/python && \
Expand Down