Skip to content

Commit 41d831d

Browse files
committed
ansible: Alpine 3.12, OpenSSL 1.1.1g, remove OpenSSL 1.0.2 and FIPS
1 parent d4b074c commit 41d831d

File tree

3 files changed

+17
-35
lines changed

3 files changed

+17
-35
lines changed

ansible/roles/docker/templates/alpine310.Dockerfile.j2 renamed to ansible/roles/docker/templates/alpine312.Dockerfile.j2

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.10
1+
FROM alpine:3.12
22

33
ENV LC_ALL C
44
ENV USER {{ server_user }}
@@ -27,26 +27,27 @@ RUN apk add --no-cache --virtual .build-deps \
2727
libgcc \
2828
linux-headers \
2929
make \
30-
paxctl \
31-
python \
30+
python3 \
3231
tar \
3332
ccache \
3433
openjdk8 \
3534
git \
3635
procps \
3736
openssh-client \
38-
py2-pip \
37+
py3-pip \
3938
bash \
4039
automake \
4140
libtool \
4241
autoconf
4342

44-
RUN pip install tap2junit
43+
RUN pip3 install tap2junit
4544

4645
RUN addgroup -g {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
4746

4847
RUN adduser -G {{ server_user }} -D -u {{ server_user_uid.stdout_lines[0] }} {{ server_user }}
4948

49+
RUN ln -s /usr/bin/python3 /usr/local/bin/python
50+
5051
VOLUME /home/{{ server_user }}/ /home/{{ server_user }}/.ccache
5152

5253
USER iojs:iojs

ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,45 +34,25 @@ RUN addgroup --gid {{ server_user_gid.stdout_lines[0] }} {{ server_user }}
3434

3535
RUN adduser --gid {{ server_user_gid.stdout_lines[0] }} --uid {{ server_user_uid.stdout_lines[0] }} --disabled-password --gecos {{ server_user }} {{ server_user }}
3636

37-
ENV OPENSSL102DIR /opt/openssl-1.0.2r
37+
ENV OPENSSL110DIR /opt/openssl-1.1.0l
3838

39-
RUN mkdir -p /tmp/openssl_1.0.2r && \
40-
cd /tmp/openssl_1.0.2r && \
41-
curl -sL https://www.openssl.org/source/openssl-1.0.2r.tar.gz | tar zxv --strip=1 && \
42-
./Configure shared linux-x86_64 --prefix=$OPENSSL102DIR -fPIC && \
43-
make -j 6 && \
44-
make install && \
45-
rm -rf /tmp/openssl_1.0.r
46-
47-
ENV OPENSSL110DIR /opt/openssl-1.1.0j
48-
49-
RUN mkdir -p /tmp/openssl_1.1.0j && \
50-
cd /tmp/openssl_1.1.0j && \
51-
curl -sL https://www.openssl.org/source/openssl-1.1.0j.tar.gz | tar zxv --strip=1 && \
39+
RUN mkdir -p /tmp/openssl_1.1.0l && \
40+
cd /tmp/openssl_1.1.0l && \
41+
curl -sL https://www.openssl.org/source/openssl-1.1.0l.tar.gz | tar zxv --strip=1 && \
5242
./config --prefix=$OPENSSL110DIR && \
5343
make -j 6 && \
5444
make install && \
55-
rm -rf /tmp/openssl_1.1.0j
45+
rm -rf /tmp/openssl_1.1.0l
5646

57-
ENV OPENSSL111DIR /opt/openssl-1.1.1b
47+
ENV OPENSSL111DIR /opt/openssl-1.1.1g
5848

59-
RUN mkdir -p /tmp/openssl_1.1.1b && \
60-
cd /tmp/openssl_1.1.1b && \
61-
curl -sL https://www.openssl.org/source/openssl-1.1.1b.tar.gz | tar zxv --strip=1 && \
49+
RUN mkdir -p /tmp/openssl_1.1.1g && \
50+
cd /tmp/openssl_1.1.1g && \
51+
curl -sL https://www.openssl.org/source/openssl-1.1.1g.tar.gz | tar zxv --strip=1 && \
6252
./config --prefix=$OPENSSL111DIR && \
6353
make -j 6 && \
6454
make install && \
65-
rm -rf /tmp/openssl_1.1.1b
66-
67-
ENV FIPS20DIR /opt/openssl-fips_2.0.16
68-
69-
RUN FIPSDIR=$FIPS20DIR mkdir -p /tmp/openssl-fips_2.0.16 && \
70-
cd /tmp/openssl-fips_2.0.16 && \
71-
curl -sL https://openssl.org/source/openssl-fips-2.0.16.tar.gz | tar zxv --strip=1 && \
72-
./config --prefix=$FIPS20DIR && \
73-
make && \
74-
make install && \
75-
rm -rf /tmp/openssl-fips_2.0.16
55+
rm -rf /tmp/openssl_1.1.1g
7656

7757
ENV ZLIB12DIR /opt/zlib_1.2.11
7858

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def buildExclusions = [
3333
[ /^ubuntu1404-32/, anyType, gte(10) ], // 32-bit linux for <10 only
3434
[ /^ubuntu1404-64/, anyType, gte(12) ],
3535
[ /^ubuntu1604-32/, anyType, gte(10) ], // 32-bit linux for <10 only
36+
[ /^alpine-latest-x64$/, anyType, lt(13) ], // Alpine 3.12 doesn't have Python 2
3637

3738
// Linux PPC LE ------------------------------------------
3839
[ /^centos7-ppcle/, anyType, lt(10) ],

0 commit comments

Comments
 (0)