Skip to content

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

Merged
qingling128 merged 3 commits intomasterfrom
igorpeshansky-fix-build-dockerfiles
Jun 27, 2022
Merged

Update build container Dockerfiles to allow them to build again.#132
qingling128 merged 3 commits intomasterfrom
igorpeshansky-fix-build-dockerfiles

Conversation

@igorpeshansky
Copy link
Contributor

This is a prerequisite for continuing work on #131.

Also restore some deprecated dependencies. This is part of the effort to switch to master as the source of truth for these. The dependencies are harmless, since they are not included unless explicitly enabling the plugins, but allows the legacy builds to proceed. This partially reverts #83 (only the build container part).

Copy link
Contributor

@qingling128 qingling128 left a comment

Choose a reason for hiding this comment

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

LGTM with a question

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

Choose a reason for hiding this comment

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

😂

@qingling128 qingling128 merged commit 9b78fb7 into master Jun 27, 2022
@igorpeshansky igorpeshansky deleted the igorpeshansky-fix-build-dockerfiles branch June 27, 2022 17:06
igorpeshansky added a commit that referenced this pull request Jun 27, 2022
Also a cosmetic update to the URL in the amzn build container.
A follow-on to #132.
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

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.

perl-ExtUtils-Embed \
pkgconfig \
postgresql-devel \
python36-devel \
Copy link
Contributor Author

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.

igorpeshansky added a commit that referenced this pull request Jun 27, 2022
Also a cosmetic update to the URL in the amzn build container.
A follow-on to #132.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants