Skip to content

Commit

Permalink
Various build fixes and add jmespath Python dependency.
Browse files Browse the repository at this point in the history 
- Add jmespath so that we can use the json_query filter. Note that you have to install jmespath before it can be used, it cannot be installed and used in the same Ansible run.
- Explicitly add PYCURL_SSL_LIBRARY env variable to all builds so that pycurl successfully builds.
- Blacklist rsync31u from IUS repo for CentOS 6.
- Fix Amazon 2018.03 gcc build issues: https://forums.aws.amazon.com/message.jspa?messageID=859785#859785
  • Loading branch information
@ju2wheels
ju2wheels committed Jul 24, 2018
1 parent a79123b commit 139a0d5
Show file tree
Hide file tree
Showing 62 changed files with 178 additions and 66 deletions.
4 changes: 3 additions & 1 deletion 1.x-alpine-3.3/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.3
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
apk add --repository "https://dl-cdn.alpinelinux.org/alpine/v3.5/community" \
Expand Down Expand Up @@ -62,6 +63,7 @@ RUN sed -i 's/http:/https:/g' /etc/apk/repositories
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
"libvirt-python < 4.1.0" \
linode-python \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-alpine-3.4/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.4
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
apk upgrade --latest --update-cache && \
Expand Down Expand Up @@ -65,6 +66,7 @@ RUN sed -i 's/http:/https:/g' /etc/apk/repositories
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
"libvirt-python < 4.1.0" \
linode-python \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-alpine-3.5/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.5
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
apk upgrade --latest --update-cache && \
Expand Down Expand Up @@ -62,6 +63,7 @@ RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
libvirt-python \
linode-python \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-alpine-3.6/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.6
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
apk upgrade --latest --update-cache && \
Expand Down Expand Up @@ -62,6 +63,7 @@ RUN sed -i 's/http:/https:/g' /etc/apk/repositories && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
libvirt-python \
linode-python \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-alpine-3.7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.7
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN apk upgrade --latest --update-cache && \
apk add bash \
Expand Down Expand Up @@ -61,6 +62,7 @@ RUN apk upgrade --latest --update-cache && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
libvirt-python \
linode-python \
Expand Down
1 change: 1 addition & 0 deletions 1.x-amazonlinux-2016.09/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-amazonlinux-2017.03/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-amazonlinux-2017.09/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-amazonlinux-2017.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-amazonlinux-2018.03/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ FROM amazonlinux:2018.03
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"
ENV PYCURL_SSL_LIBRARY "nss"

RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
yum upgrade -y && \
yum groupinstall -y "Development Tools" && \
alternatives --set gcc "/usr/bin/gcc48" && \
yum install -y crontabs \
curl \
git \
Expand Down Expand Up @@ -55,6 +56,7 @@ RUN sed -i 's/releasever=latest/#releasever=latest/' /etc/yum.conf && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
5 changes: 4 additions & 1 deletion 1.x-centos-6/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM centos:6
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN yum upgrade -y && \
yum install -y "https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" && \
yum install -y "https://centos6.iuscommunity.org/ius-release.rpm" && \
sed -i '/^\[ius]/a exclude=rsync31u' /etc/yum.repos.d/ius.repo && \
yum groupinstall -y "Development Tools" && \
yum install -y crontabs \
curl \
Expand Down Expand Up @@ -56,6 +58,7 @@ RUN yum upgrade -y
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-centos-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN yum upgrade -y
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
6 changes: 4 additions & 2 deletions 1.x-debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM debian:7
MAINTAINER Julio Lajara <[email protected]>

ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN apt-get update && \
apt-get -y dist-upgrade && \
Expand Down Expand Up @@ -69,6 +70,7 @@ RUN apt-get update && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
6 changes: 4 additions & 2 deletions 1.x-debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM debian:8
MAINTAINER Julio Lajara <[email protected]>

ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN apt-get update && \
apt-get -y dist-upgrade && \
Expand Down Expand Up @@ -69,6 +70,7 @@ RUN apt-get update && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
6 changes: 4 additions & 2 deletions 1.x-debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM debian:9
MAINTAINER Julio Lajara <[email protected]>

ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV DEBIAN_FRONTEND "noninteractive"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "openssl"

RUN apt-get update && \
apt-get -y dist-upgrade && \
Expand Down Expand Up @@ -71,6 +72,7 @@ RUN apt-get update && \
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-fedora-20/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
1 change: 1 addition & 0 deletions 1.x-fedora-21/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-fedora-22/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM fedora:22
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "nss"

RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo && \
dnf upgrade -y && \
Expand Down Expand Up @@ -57,6 +58,7 @@ RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-fedora-23/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM fedora:23
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "nss"

RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo && \
dnf upgrade -y && \
Expand Down Expand Up @@ -59,6 +60,7 @@ RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
4 changes: 3 additions & 1 deletion 1.x-fedora-24/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM fedora:24
MAINTAINER Julio Lajara <[email protected]>

ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PATH "/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
ENV PYCURL_SSL_LIBRARY "nss"

RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo && \
dnf upgrade -y && \
Expand Down Expand Up @@ -59,6 +60,7 @@ RUN sed -i 's/enabled=0/enabled=1/' /etc/yum.repos.d/fedora-updates-testing.repo
github3.py \
google-auth \
influxdb \
jmespath \
kazoo \
linode-python \
lxml \
Expand Down
Loading

0 comments on commit 139a0d5

Please sign in to comment.