Merge branch '77-avoid-openssl-1.0-dev' into 'master'

Avoid to use libssl1.0-dev packages in Debian/Ubuntu distribution

Closes #77

See merge request gitlab-org/gitlab-build-images!389
This commit is contained in:
DJ Mountney 2021-04-07 14:31:42 +00:00
commit 0a2842a08c
2 changed files with 2 additions and 2 deletions

View file

@ -1,7 +1,7 @@
FROM ubuntu:18.04
RUN apt-get update -q \
&& apt-get install -y g++ gcc git make curl zlib1g-dev libssl1.0-dev locales \
&& apt-get install -y g++ gcc git make curl zlib1g-dev libssl-dev locales \
&& apt-get autoremove -yq \
&& apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/*

View file

@ -1,7 +1,7 @@
FROM debian:stretch
RUN apt-get update -q \
&& apt-get install -y g++ gcc git make curl zlib1g-dev libssl1.0-dev locales \
&& apt-get install -y g++ gcc git make curl zlib1g-dev libssl-dev locales \
&& apt-get autoremove -yq \
&& apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/*