Skip to content

Commit

Permalink
Adds centos and debian poppercheck images
Browse files Browse the repository at this point in the history
fixes #161
fixes #162
  • Loading branch information
ivotron committed Dec 7, 2017
1 parent dfc5c8d commit 8f3b332
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
language: bash
services: docker
script:
- ./build-me.sh
- ./popper/_check/build_images
4 changes: 2 additions & 2 deletions popper/_check/alpine-3.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:2.7-alpine
RUN apk add --no-cache curl bash && \
FROM python:2.7-alpine3.4
RUN apk add --no-cache curl bash git && \
curl -SL https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz | tar -xzv docker/docker && \
mv docker/docker /usr/bin && \
pip install --no-cache-dir pyaml && \
Expand Down
29 changes: 29 additions & 0 deletions popper/_check/build_images
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env bash
set -e

push_too="false"
while getopts ":p" o; do
case "${o}" in
p)
push_too="true"
;;
esac
done

for d in ./* ; do
if [ ! -d $d ]; then
continue
fi
echo "############"
echo "# Building $(basename $d)"
echo "############"
pushd $d
cp ../check.py .
docker build -t falsifiable/poppercheck:$(basename $d) .
rm check.py
popd

if [ "$push_too" == "true" ]; then
docker push falsifiable/poppercheck:$(basename $d)
fi
done
8 changes: 8 additions & 0 deletions popper/_check/centos-7.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM centos:7.4.1708

RUN yum -y install git PyYAML && yum clean all && \
curl -SL https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz | tar -xzv docker/docker && \
mv docker/docker /usr/bin && \
rm -r docker/
ADD check.py /
ENTRYPOINT ["/check.py"]
14 changes: 14 additions & 0 deletions popper/_check/debian-9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
FROM python:2.7-slim-stretch

ARG DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get --no-install-recommends -y install curl git && \
apt-get autoremove --purge -y && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
curl -SL https://download.docker.com/linux/static/stable/x86_64/docker-17.06.2-ce.tgz | tar -xzv docker/docker && \
mv docker/docker /usr/bin && \
pip install --no-cache-dir pyaml && \
rm -r docker/
ADD check.py /
ENTRYPOINT ["/check.py"]
1 change: 1 addition & 0 deletions popper/_check/stretch
2 changes: 1 addition & 1 deletion popper/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func runInDocker(checkFlags []string, checkEnv string) {
if err != nil {
log.Fatal(err)
}
cmd_args = append(cmd_args, "--volume", dir+":"+dir, "--workdir", dir, "--volume", "/var/run/docker.sock:/var/run/docker.sock", "ivotron/poppercheck:"+checkEnv)
cmd_args = append(cmd_args, "--volume", dir+":"+dir, "--workdir", dir, "--volume", "/var/run/docker.sock:/var/run/docker.sock", "falsifiable/poppercheck:"+checkEnv)

s := make([]interface{}, len(cmd_args)+len(checkFlags))
for i, v := range cmd_args {
Expand Down

0 comments on commit 8f3b332

Please sign in to comment.