Skip to content

Commit 0e643c0

Browse files
authored
improve Alpine 3.17 helix image (#799)
2 parents bea9c3c + 695c149 commit 0e643c0

File tree

2 files changed

+12
-45
lines changed

2 files changed

+12
-45
lines changed

src/alpine/3.17/helix/amd64/Dockerfile

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,10 @@
1-
FROM alpine:3.17
2-
3-
RUN apk update && \
4-
apk add --no-cache \
5-
autoconf \
6-
automake \
7-
bash \
8-
build-base \
9-
cargo \
10-
clang \
11-
clang-dev \
12-
cmake \
13-
coreutils \
14-
curl \
15-
gcc \
16-
gettext-dev \
17-
git \
18-
icu-dev \
19-
iputils \
20-
jq \
21-
krb5-dev \
22-
libffi-dev \
23-
libtool \
24-
libunwind-dev \
25-
linux-headers \
26-
lld \
27-
lldb-dev \
28-
llvm \
29-
lttng-ust-dev \
30-
make \
31-
numactl-dev \
32-
openssl \
33-
openssl-dev \
34-
paxctl \
35-
py3-lldb \
36-
python3-dev \
37-
rust \
38-
shadow \
39-
sudo \
40-
tzdata \
41-
util-linux-dev \
42-
which \
43-
zlib-dev
1+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-local
2+
RUN apk update && apk add --no-cache \
3+
cargo \
4+
iputils \
5+
libffi-dev \
6+
musl-locales \
7+
rust
448

459
# Install Helix Dependencies
4610
RUN ln -sf /usr/bin/python3 /usr/bin/python && \
@@ -65,7 +29,7 @@ RUN cd /tmp && \
6529

6630
# Needed for corefx tests to pass
6731
ENV LANG=en-US.UTF-8
68-
RUN echo export LANG=en-US.UTF-8 >> /etc/profile.d/locale.sh
32+
RUN echo export LANG=${LANG} >> /etc/profile.d/locale.sh
6933

7034
# create helixbot user and give rights to sudo without password
7135
# Alpine does not support long options

src/alpine/manifest.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,10 @@
240240
"osVersion": "alpine3.17",
241241
"tags": {
242242
"alpine-3.17-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
243-
"alpine-3.17$(FloatingTagSuffix)": {}
243+
"alpine-3.17$(FloatingTagSuffix)": {},
244+
"alpine-3.17-local": {
245+
"isLocal": true
246+
}
244247
}
245248
}
246249
]

0 commit comments

Comments
 (0)