Skip to content

Update build container Dockerfiles to allow them to build again. #132

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

Merged
qingling128 merged 3 commits into from
Jun 27, 2022
Merged

Update build container Dockerfiles to allow them to build again. #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09f17d2
Restore old dependencies in the build Dockerfiles.
igorpeshansky Jun 25, 2022
399aece
Update repos in the SLES build Dockerfiles.
igorpeshansky Mar 29, 2022
f2eafa0
Fix the rpm-macros-rpmforge package in the amzn build Dockerfile.
igorpeshansky Jun 24, 2022
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
4 changes: 3 additions & 1 deletion build/x86_64_amzn-2016.09/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2016.09

ADD http://ftp.tu-chemnitz.de/pub/linux/dag/redhat/el6/en/x86_64/rpmforge/RPMS/rpm-macros-rpmforge-0-6.el6.rf.noarch.rpm .
ADD https://rpmfind.net/linux/dag/redhat/el6/en/i386/dag/RPMS/rpm-macros-rpmforge-0-6.el6.rf.noarch.rpm .
Copy link
Contributor Author

@igorpeshansky igorpeshansky Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not that it matters too much (it's a noarch RPM), but I probably should have used x86_64 instead of i386 here… Fixed in #133.

RUN yum -y install epel-release \
&& yum -y install \
autoconf \
Expand All @@ -22,9 +22,11 @@ RUN yum -y install epel-release \
perl-devel \
perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python-devel \
rpm-build \
rpm-sign \
varnish-libs-devel \
which \
yajl-devel \
&& rpm -Uvh rpm-macros-rpmforge*.rpm \
Expand Down
4 changes: 4 additions & 0 deletions build/x86_64_bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ RUN apt-get -y update \
flex \
gcc \
git \
libbson-dev \
libcurl4-openssl-dev \
libhiredis-dev \
libltdl-dev \
libmongoc-dev \
libmysqlclient-dev \
libpq-dev \
libssl-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
lsb-release \
make \
Expand Down
4 changes: 4 additions & 0 deletions build/x86_64_buster/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ RUN apt-get -y update \
libcurl4-openssl-dev \
libhiredis-dev \
libltdl-dev \
libmongoc-dev \
libpq-dev \
libpq5 \
libssl-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
make \
pkg-config \
Expand Down
2 changes: 2 additions & 0 deletions build/x86_64_centos6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ RUN yum -y install epel-release \
openssl-devel \
perl-devel \
perl-ExtUtils-Embed \
postgresql-devel \
python-devel \
rpm-build \
varnish-libs-devel \
which \
yajl-devel \
&& yum -y clean all
2 changes: 2 additions & 0 deletions build/x86_64_centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ RUN yum -y install epel-release \
perl-devel \
perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python-devel \
rpm-build \
rpm-sign \
varnish-libs-devel \
which \
yajl-devel \
&& yum -y clean all
2 changes: 2 additions & 0 deletions build/x86_64_centos8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ RUN dnf -y install 'dnf-command(config-manager)' \
perl-devel \
perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python36-devel \
Copy link
Contributor Author

@igorpeshansky igorpeshansky Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needed to be updated to python2-devel. Fixed in #133.

rpm-build \
rpm-sign \
varnish-libs-devel \
which \
yajl-devel \
&& yum -y clean all
2 changes: 2 additions & 0 deletions build/x86_64_jessie/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ RUN apt-get -y update \
libhiredis-dev \
libltdl-dev \
libmysqlclient-dev \
libpq-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
make \
pkg-config \
Expand Down
2 changes: 2 additions & 0 deletions build/x86_64_precise/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ RUN apt-get -y update \
libhiredis-dev \
libltdl-dev \
libmysqlclient-dev \
libpq-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
lsb-release \
make \
Expand Down
18 changes: 13 additions & 5 deletions build/x86_64_sles12/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
FROM opensuse/leap:42.3

RUN zypper addrepo https://download.opensuse.org/repositories/Apache/SLE_12_SP4/Apache.repo \
# Add SLES 15 repo to install libhiredis0_13 from hiredis-devel.
&& zypper addrepo https://download.opensuse.org/repositories/server:database/SLE_15/server:database.repo \
# Remove expired root certificate.
Copy link
Contributor

@qingling128 qingling128 Jun 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😂

RUN mv /var/lib/ca-certificates/pem/DST_Root_CA_X3.pem /etc/pki/trust/blacklist/ \
&& update-ca-certificates

RUN true \
# The 'OSS Update' repo signature is no longer valid, so verify the checksum instead.
&& zypper --no-gpg-check refresh 'OSS Update' \
&& (echo 'b889b4bba03074cd66ef9c0184768f4816d4ccb1fa9ec2721c5583304c5f23d0 /var/cache/zypp/raw/OSS Update/repodata/repomd.xml' | sha256sum --check) \
# Add Herbster0815 repo to install the latest automake.
&& zypper addrepo https://download.opensuse.org/pub/opensuse/repositories/home:/Herbster0815/openSUSE_Leap_15.2/home:Herbster0815.repo \
&& zypper addrepo https://download.opensuse.org/pub/opensuse/repositories/home:/Herbster0815/openSUSE_Leap_15.4/home:Herbster0815.repo \
&& zypper -n --gpg-auto-import-keys refresh \
&& zypper -n install \
autoconf \
Expand All @@ -24,11 +29,14 @@ RUN zypper addrepo https://download.opensuse.org/repositories/Apache/SLE_12_SP4/
libmysqlclient-devel \
make \
openssl-devel \
hiredis-devel \
pkg-config \
postgresql-devel \
python-devel \
rpm-build \
varnish-devel \
which \
# Use the SLES 15 repo to install libhiredis0_13 from hiredis-devel.
&& zypper -n -p https://download.opensuse.org/distribution/leap/15.3/repo/oss/ install hiredis-devel \
# Pretend we are on SLES 12.
&& /bin/sed -i -e 's/VERSION = 42.3/VERSION = 12/' /etc/SuSE-release \
&& /bin/sed -i -e 's/VERSION="42.3"/VERSION="12-SP3"/' -e 's/VERSION_ID="42.3"/VERSION_ID="12.3"/' /etc/os-release \
Expand Down
10 changes: 7 additions & 3 deletions build/x86_64_sles15/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM opensuse/leap:15.1

RUN zypper addrepo https://download.opensuse.org/repositories/devel:/libraries:/c_c++/openSUSE_Leap_15.1/devel:libraries:c_c++.repo \
RUN zypper addrepo https://ftp.lysator.liu.se/pub/opensuse/repositories/devel:/libraries:/c_c++/openSUSE_Leap_15.1/devel:libraries:c_c++.repo \
# The lysator.liu.se mirror still references download.opensuse.org.
&& sed -i 's@download.opensuse.org@ftp.lysator.liu.se/pub/opensuse@' /etc/zypp/repos.d/devel_libraries_c_c++.repo \
# Add Herbster0815 repo to install the latest automake.
&& zypper addrepo https://download.opensuse.org/pub/opensuse/repositories/home:/Herbster0815/openSUSE_Leap_15.2/home:Herbster0815.repo \
&& zypper addrepo https://download.opensuse.org/pub/opensuse/repositories/home:/Herbster0815/openSUSE_Leap_15.4/home:Herbster0815.repo \
&& zypper -n --gpg-auto-import-keys refresh \
&& zypper -n install --allow-vendor-change \
autoconf \
Expand All @@ -12,6 +14,7 @@ RUN zypper addrepo https://download.opensuse.org/repositories/devel:/libraries:/
flex \
gcc \
git \
hiredis-devel \
java-1_8_0-openjdk-devel \
libcurl4 \
libcurl-devel \
Expand All @@ -24,10 +27,11 @@ RUN zypper addrepo https://download.opensuse.org/repositories/devel:/libraries:/
libmysqlclient-devel \
make \
openssl-devel \
hiredis-devel \
pkg-config \
postgresql-devel \
python-devel \
rpm-build \
varnish-devel \
which \
# Pretend we are on SLES 15.
&& /bin/sed -i -e 's/VERSION="15.1"/VERSION="15-SP1"/' /etc/os-release \
Expand Down
3 changes: 3 additions & 0 deletions build/x86_64_stretch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ RUN apt-get -y update \
libcurl4-openssl-dev \
libhiredis-dev \
libltdl-dev \
libpq-dev \
libpq5 \
libssl1.0-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
make \
pkg-config \
Expand Down
2 changes: 2 additions & 0 deletions build/x86_64_trusty/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ RUN apt-get -y update \
libhiredis-dev \
libltdl-dev \
libmysqlclient-dev \
libpq-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
lsb-release \
make \
Expand Down
2 changes: 2 additions & 0 deletions build/x86_64_wheezy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ RUN apt-get -y update \
libhiredis-dev \
libltdl-dev \
libmysqlclient-dev \
libpq-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
make \
pkg-config \
Expand Down
2 changes: 2 additions & 0 deletions build/x86_64_xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ RUN apt-get -y update \
libhiredis-dev \
libltdl-dev \
libmysqlclient-dev \
libpq-dev \
libtool \
libvarnishapi-dev \
libyajl-dev \
lsb-release \
make \
Expand Down