Skip to content

Add python 3.6 PPA repository to Xenial packagingtest #95

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
arm4b merged 2 commits into from
Dec 8, 2020
Merged

Add python 3.6 PPA repository to Xenial packagingtest #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e280ea2
Add python 3.6 PPA repository to Xenial packagingtest
Dec 8, 2020
7655c75
Fix CentOS8 build Error: No matching repo to modify: PowerTools
Dec 8, 2020
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: 2 additions & 2 deletions buildpack/centos8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ RUN yum -y install \
wget

RUN yum install -y yum-utils \
&& dnf config-manager --enable PowerTools \
&& dnf config-manager --enable powertools \
Copy link
Member Author

@arm4b arm4b Dec 8, 2020

Choose a reason for hiding this comment

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

Build also identified a failure for CentOS8 images:

Error: No matching repo to modify: PowerTools.

which is not related to this PR and probably some recent upstream changes, but I'll fix it anyway here to have the CI 🟢

&& yum install -y epel-release \
&& yum -y install \
ImageMagick \
ImageMagick-devel \
libyaml-devel \
&& dnf config-manager --disable PowerTools \
&& dnf config-manager --disable powertools \
&& yum remove -y epel-release yum-utils

# Build tools
Expand Down
4 changes: 2 additions & 2 deletions packagingbuild/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ RUN yum -y install \

{% if (version == '8') %}
RUN yum install -y yum-utils \
&& dnf config-manager --enable PowerTools \
&& dnf config-manager --enable powertools \
&& yum install -y epel-release \
&& yum -y install \
ImageMagick \
ImageMagick-devel \
libyaml-devel \
glibc-langpack-en \
&& dnf config-manager --disable PowerTools \
&& dnf config-manager --disable powertools \
&& yum remove -y epel-release yum-utils
{% endif %}

Expand Down
4 changes: 2 additions & 2 deletions packagingbuild/centos8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ RUN yum -y install \git \


RUN yum install -y yum-utils \
&& dnf config-manager --enable PowerTools \
&& dnf config-manager --enable powertools \
&& yum install -y epel-release \
&& yum -y install \
ImageMagick \
ImageMagick-devel \
libyaml-devel \
glibc-langpack-en \
&& dnf config-manager --disable PowerTools \
&& dnf config-manager --disable powertools \
&& yum remove -y epel-release yum-utils


Expand Down
4 changes: 2 additions & 2 deletions packagingtest/Dockerfile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ RUN yum -y install \
setup
{% if (version == '8') %}
RUN yum install -y yum-utils \
&& dnf config-manager --enable PowerTools \
&& dnf config-manager --enable powertools \
&& yum install -y epel-release \
&& yum -y install \
ImageMagick \
ImageMagick-devel \
libyaml-devel \
libffi-devel \
glibc-langpack-en \
&& dnf config-manager --disable PowerTools \
&& dnf config-manager --disable powertools \
&& yum remove -y epel-release yum-utils
{% endif %}
# Build tools
Expand Down
4 changes: 2 additions & 2 deletions packagingtest/centos8/systemd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ RUN yum -y install \
setup

RUN yum install -y yum-utils \
&& dnf config-manager --enable PowerTools \
&& dnf config-manager --enable powertools \
&& yum install -y epel-release \
&& yum -y install \
ImageMagick \
ImageMagick-devel \
libyaml-devel \
libffi-devel \
glibc-langpack-en \
&& dnf config-manager --disable PowerTools \
&& dnf config-manager --disable powertools \
&& yum remove -y epel-release yum-utils

# Build tools
Expand Down
6 changes: 5 additions & 1 deletion packagingtest/xenial/systemd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
apt-get -y install gdebi-core sshpass cron netcat net-tools iproute

# install apt https transport so apt sources can be added that refernece https:// URLs
RUN apt-get -y install apt-transport-https ca-certificates
RUN apt-get -y install apt-transport-https software-properties-common ca-certificates

# Add python 3.6 repository from the 3rd party PPA as it's not available in base distro
RUN add-apt-repository -y ppa:deadsnakes/ppa && \
apt-get update

# install netbase package (includes /etc/protocols and other files we rely on)
RUN apt-get -y install netbase
Expand Down