Skip to content

Commit a270908

Browse files
authored
Merge pull request #212 from schafdog/main
Add Dockerfile for Debian 10 plus changes for Debian 9
2 parents 7b027b6 + 7a34719 commit a270908

File tree

2 files changed

+42
-5
lines changed

2 files changed

+42
-5
lines changed

swift-ci/master/debian/10/Dockerfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
FROM debian:10
2+
3+
RUN groupadd -g 998 build-user && \
4+
useradd -m -r -u 998 -g build-user build-user
5+
6+
ENV DEBIAN_FRONTEND="noninteractive"
7+
8+
RUN apt-get -y update && apt-get -y --no-install-recommends install \
9+
build-essential \
10+
clang \
11+
cmake \
12+
git \
13+
icu-devtools \
14+
libcurl4-openssl-dev \
15+
libedit-dev \
16+
libicu-dev \
17+
libncurses5-dev \
18+
libpython3-dev \
19+
libsqlite3-dev \
20+
libxml2-dev \
21+
ninja-build \
22+
pkg-config \
23+
python \
24+
python-six \
25+
python2-dev \
26+
python3-six \
27+
python3-distutils \
28+
rsync \
29+
swig \
30+
systemtap-sdt-dev \
31+
tzdata \
32+
unzip \
33+
uuid-dev \
34+
ca-certificates
35+
36+
USER build-user
37+
38+
WORKDIR /home/build-user

swift-ci/master/debian/9/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ RUN groupadd -g 998 build-user && \
55

66
ENV DEBIAN_FRONTEND="noninteractive"
77

8-
RUN apt update
8+
RUN apt-get update
99

10-
RUN apt -y install \
10+
RUN apt-get --no-install-recommends -y install \
1111
build-essential \
1212
clang \
1313
cmake \
@@ -20,16 +20,15 @@ RUN apt -y install \
2020
libsqlite3-dev \
2121
libxml2-dev \
2222
ninja-build \
23+
pkg-config \
2324
python \
24-
python-dev \
2525
python-six \
26-
pkg-config \
2726
rsync \
2827
swig \
2928
systemtap-sdt-dev \
3029
tzdata \
3130
unzip \
32-
vim \
31+
ca-certificates \
3332
uuid-dev
3433

3534
USER build-user

0 commit comments

Comments
 (0)