Skip to content

Commit c6f5913

Browse files
authored
Merge pull request #95 from StackStorm/packagingtest-xenial-ppa3.6
Add python 3.6 PPA repository to Xenial packagingtest
2 parents a636133 + 7655c75 commit c6f5913

6 files changed

Lines changed: 15 additions & 11 deletions

File tree

buildpack/centos8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ RUN yum -y install \
77
wget
88

99
RUN yum install -y yum-utils \
10-
&& dnf config-manager --enable PowerTools \
10+
&& dnf config-manager --enable powertools \
1111
&& yum install -y epel-release \
1212
&& yum -y install \
1313
ImageMagick \
1414
ImageMagick-devel \
1515
libyaml-devel \
16-
&& dnf config-manager --disable PowerTools \
16+
&& dnf config-manager --disable powertools \
1717
&& yum remove -y epel-release yum-utils
1818

1919
# Build tools

packagingbuild/Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ RUN yum -y install \
2121

2222
{% if (version == '8') %}
2323
RUN yum install -y yum-utils \
24-
&& dnf config-manager --enable PowerTools \
24+
&& dnf config-manager --enable powertools \
2525
&& yum install -y epel-release \
2626
&& yum -y install \
2727
ImageMagick \
2828
ImageMagick-devel \
2929
libyaml-devel \
3030
glibc-langpack-en \
31-
&& dnf config-manager --disable PowerTools \
31+
&& dnf config-manager --disable powertools \
3232
&& yum remove -y epel-release yum-utils
3333
{% endif %}
3434

packagingbuild/centos8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ RUN yum -y install \git \
1313

1414

1515
RUN yum install -y yum-utils \
16-
&& dnf config-manager --enable PowerTools \
16+
&& dnf config-manager --enable powertools \
1717
&& yum install -y epel-release \
1818
&& yum -y install \
1919
ImageMagick \
2020
ImageMagick-devel \
2121
libyaml-devel \
2222
glibc-langpack-en \
23-
&& dnf config-manager --disable PowerTools \
23+
&& dnf config-manager --disable powertools \
2424
&& yum remove -y epel-release yum-utils
2525

2626

packagingtest/Dockerfile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ RUN yum -y install \
2121
setup
2222
{% if (version == '8') %}
2323
RUN yum install -y yum-utils \
24-
&& dnf config-manager --enable PowerTools \
24+
&& dnf config-manager --enable powertools \
2525
&& yum install -y epel-release \
2626
&& yum -y install \
2727
ImageMagick \
2828
ImageMagick-devel \
2929
libyaml-devel \
3030
libffi-devel \
3131
glibc-langpack-en \
32-
&& dnf config-manager --disable PowerTools \
32+
&& dnf config-manager --disable powertools \
3333
&& yum remove -y epel-release yum-utils
3434
{% endif %}
3535
# Build tools

packagingtest/centos8/systemd/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ RUN yum -y install \
1414
setup
1515

1616
RUN yum install -y yum-utils \
17-
&& dnf config-manager --enable PowerTools \
17+
&& dnf config-manager --enable powertools \
1818
&& yum install -y epel-release \
1919
&& yum -y install \
2020
ImageMagick \
2121
ImageMagick-devel \
2222
libyaml-devel \
2323
libffi-devel \
2424
glibc-langpack-en \
25-
&& dnf config-manager --disable PowerTools \
25+
&& dnf config-manager --disable powertools \
2626
&& yum remove -y epel-release yum-utils
2727

2828
# Build tools

packagingtest/xenial/systemd/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
4141
apt-get -y install gdebi-core sshpass cron netcat net-tools iproute
4242

4343
# install apt https transport so apt sources can be added that refernece https:// URLs
44-
RUN apt-get -y install apt-transport-https ca-certificates
44+
RUN apt-get -y install apt-transport-https software-properties-common ca-certificates
45+
46+
# Add python 3.6 repository from the 3rd party PPA as it's not available in base distro
47+
RUN add-apt-repository -y ppa:deadsnakes/ppa && \
48+
apt-get update
4549

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

0 commit comments

Comments
 (0)