missed a &&

.drone.yml

@@ -10,6 +10,19 @@ concurrency:
   limit: 9
 
 steps:
+
+- name: build-ubuntu-20
+  image: plugins/docker
+  settings:
+    dockerfile: ubuntu-20.04/Dockerfile
+    dry_run: true
+    repo: lerentis/ansible
+    tag: ubuntu-20.04
+  when:
+    event:
+    - push
+    - pull_request
+
 - name: build-ubuntu-18
   image: plugins/docker
   settings:
@@ -82,13 +95,37 @@ steps:
     - push
     - pull_request
 
-- name: build-debian-7
+- name: build-debian-9
   image: plugins/docker
   settings:
-    dockerfile: debian-8/Dockerfile
+    dockerfile: debian-9/Dockerfile
     dry_run: true
     repo: lerentis/ansible
-    tag: debian-7
+    tag: debian-9
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-debian-10
+  image: plugins/docker
+  settings:
+    dockerfile: debian-10/Dockerfile
+    dry_run: true
+    repo: lerentis/ansible
+    tag: debian-10
+  when:
+    event:
+    - push
+    - pull_request
+
+- name: build-centos-8
+  image: plugins/docker
+  settings:
+    dockerfile: centos-8/Dockerfile
+    dry_run: true
+    repo: lerentis/ansible
+    tag: centos-8
   when:
     event:
     - push
@@ -132,6 +169,20 @@ steps:
     event:
     - tag
 
+- name: build-ubuntu-20-publish
+  image: plugins/docker
+  settings:
+    dockerfile: ubuntu-20.04/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: lerentis/ansible
+    tag: ubuntu-20.04
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
 - name: build-ubuntu-16-publish
   image: plugins/docker
   settings:
@@ -202,14 +253,28 @@ steps:
     event:
     - tag
 
-- name: build-debian-7-publish
+- name: build-debian-9-publish
   image: plugins/docker
   settings:
-    dockerfile: debian-8/Dockerfile
+    dockerfile: debian-9/Dockerfile
     password:
       from_secret: docker_password
     repo: lerentis/ansible
-    tag: debian-7
+    tag: debian-9
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
+- name: build-debian-10-publish
+  image: plugins/docker
+  settings:
+    dockerfile: debian-10/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: lerentis/ansible
+    tag: debian-10
     username:
       from_secret: docker_username
   when:
@@ -230,6 +295,20 @@ steps:
     event:
     - tag
 
+- name: build-centos-8-publish
+  image: plugins/docker
+  settings:
+    dockerfile: centos-8/Dockerfile
+    password:
+      from_secret: docker_password
+    repo: lerentis/ansible
+    tag: centos-8
+    username:
+      from_secret: docker_username
+  when:
+    event:
+    - tag
+
 - name: build-arch-publish
   image: plugins/docker
   settings:
@@ -255,21 +334,27 @@ steps:
     - failure
     - success
   depends_on:
+  - build-ubuntu-20
   - build-ubuntu-18
   - build-ubuntu-16
   - build-ubuntu-14
   - build-fedora-24
   - build-alpine-3
   - build-debian-8
-  - build-debian-7
+  - build-debian-9
+  - build-debian-10
   - build-centos-7
+  - build-centos-8
   - build-arch
+  - build-ubuntu-20-publish
   - build-ubuntu-18-publish
   - build-ubuntu-16-publish
   - build-ubuntu-14-publish
   - build-fedora-24-publish
   - build-alpine-3-publish
   - build-debian-8-publish
-  - build-debian-7-publish
+  - build-debian-9-publish
+  - build-debian-10-publish
   - build-centos-7-publish
+  - build-centos-8-publish
   - build-arch-publish

README.md

@@ -13,6 +13,8 @@ Available operating systems:
 * debian-8
 * fedora-24
 * ubuntu-16.04
+* ubuntu-18.04
+* ubuntu-19.04
 * arch
 
 ## run playbooks
@@ -69,4 +71,4 @@ Note: /root/.ansible must not be an overlayfs, otherwise ssh accelerate won't wo
 
 * [project](https://git.burntbunch.org/lerentis/ansible-container)
 
-Current Version: 0.7.2
+Current Version: 0.7.2

alpine-3/Dockerfile

@@ -1,5 +1,7 @@
-FROM alpine:3.4
+FROM alpine:3.10
 
-RUN apk add --no-cache ansible
+RUN apk add --no-cache ansible curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss
 
 CMD ["ansible-playbook", "--help"]

arch/Dockerfile

@@ -1,5 +1,7 @@
 FROM archlinux/base
 
-RUN pacman -Syuu --noconfirm && pacman -S python2 ansible sshpass git python2-passlib python2-netaddr --noconfirm
+RUN pacman -Syuu --noconfirm && pacman -S python ansible sshpass git python-passlib python-netaddr curl --noconfirm \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss
 
 CMD ["ansible-playbook", "--help"]

build-all.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
-cd ubuntu-18.04 && docker build -t lerentis/ansible:ubuntu-18.04 .
-cd ubuntu-16.04 && docker build -t lerentis/ansible:ubuntu-16.04 .
-cd ../alpine-3 && docker build -t lerentis/ansible:alpine-3 .
-cd ../ubuntu-14.04  && docker build -t lerentis/ansible:ubuntu-14.04 .
-cd ../fedora-24 && docker build -t lerentis/ansible:fedora-24 .
-cd ../debian-8 && docker build -t lerentis/ansible:debian-8 .
-cd ../debian-7 && docker build -t lerentis/ansible:debian-7 .
-cd ../centos-7 && docker build -t lerentis/ansible:centos-7 .
-cd ../arch && docker build -t lerentis/ansible:arch .
+cd ubuntu-18.04 && docker buildx build -t lerentis/ansible:ubuntu-18.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../ubuntu-16.04 && docker buildx build -t lerentis/ansible:ubuntu-16.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../alpine-3 && docker buildx build -t lerentis/ansible:alpine-3 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../ubuntu-14.04  && docker buildx build -t lerentis/ansible:ubuntu-14.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../fedora-24 && docker buildx build -t lerentis/ansible:fedora-24 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../debian-8 && docker buildx build -t lerentis/ansible:debian-8 --platform=linux/arm,linux/amd64 . --push
+cd ../debian-7 && docker buildx build -t lerentis/ansible:debian-7 --platform=linux/arm,linux/amd64 . --push
+cd ../centos-7 && docker buildx build -t lerentis/ansible:centos-7 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../arch && docker buildx build -t lerentis/ansible:arch --platform=linux/arm,linux/arm64,linux/amd64 . --push

centos-7/Dockerfile

@@ -1,7 +1,9 @@
 FROM centos:7
 
 RUN yum -y install epel-release \
-  && yum -y install ansible git \
+  && yum -y install ansible git curl python-firewall \
+  && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+  && chmod +rx /usr/local/bin/goss \
   && yum clean headers \
   && yum clean packages
 

centos-8/Dockerfile

@@ -0,0 +1,11 @@
+FROM centos:8
+
+RUN dnf -y install python3-pip &&\
+    dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm &&\
+    dnf install -y --enablerepo epel-playground ansible curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && touch ~/.netrc && chmod og-rw ~/.netrc \
+    && pip3 install firewall
+
+CMD ["ansible-playbook", "--help"]

debian-10/Dockerfile

@@ -0,0 +1,21 @@
+FROM debian:10
+
+RUN apt-get -q update \
+    && apt-get -yq install --no-install-recommends \
+      build-essential \
+      libffi-dev \
+      libssl-dev \
+      python3 \
+      python3-dev \
+      python3-pip \
+      git \
+      apt-utils \
+      curl \
+      ansible \
+      python \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && apt-get clean 
+
+
+CMD ["ansible-playbook", "--help"]

debian-7/Dockerfile

@@ -1,10 +0,0 @@
-FROM debian:7
-
-RUN apt-get -q update \
-    && apt-get install -y python-pip python-dev git apt-utils
-
-RUN pip install --index-url=https://pypi.python.org/simple/ --upgrade pip
-
-RUN pip install git+https://github.com/ansible/ansible.git@devel
-
-CMD ["ansible-playbook", "--help"]

debian-8/Dockerfile

@@ -5,14 +5,22 @@ RUN apt-get -q update \
       build-essential \
       libffi-dev \
       libssl-dev \
-      python \
-      python-dev \
-      python-pip \
+      python3 \
+      python3-dev \
+      python3-pip \
       git \
       apt-utils \
-    && apt-get clean \
-    && pip install --upgrade pip
-
-RUN pip install git+https://github.com/ansible/ansible.git@devel
+      curl \
+      gnupg \
+      dirmngr \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && pip3 install --upgrade pip
 
+RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" >> /etc/apt/sources \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
+    && apt-get -q update \
+    && apt-get install -yq ansible \
+    && apt-get clean 
+    
 CMD ["ansible-playbook", "--help"]

debian-9/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:9
+
+RUN apt-get -q update \
+    && apt-get -yq install --no-install-recommends \
+      build-essential \
+      libffi-dev \
+      libssl-dev \
+      python3 \
+      python3-dev \
+      python3-pip \
+      git \
+      apt-utils \
+      curl \
+      gnupg \
+      dirmngr \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && pip3 install --upgrade pip
+
+RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu trusty main" >> /etc/apt/sources \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 \
+    && apt-get -q update \
+    && apt-get install -yq ansible \
+    && apt-get clean 
+
+CMD ["ansible-playbook", "--help"]

fedora-24/Dockerfile

@@ -3,6 +3,9 @@ FROM fedora:24
 RUN dnf -y install \
     ansible \
     openssh-clients \
+    curl \
+  && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+  && chmod +rx /usr/local/bin/goss \
   && dnf clean all
 
 CMD ["ansible-playbook", "--help"]

ubuntu-14.04/Dockerfile

@@ -9,6 +9,9 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
       ansible \
       git \
+      curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
     && apt-get clean
 
 CMD ["ansible-playbook", "--help"]

ubuntu-16.04/Dockerfile

@@ -11,6 +11,9 @@ RUN apt-get update \
       python-apt \
       git-core \
       openssh-client \
+      curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
     && apt-get clean
 
 CMD ["ansible-playbook", "--help"]

ubuntu-18.04/Dockerfile

@@ -11,6 +11,9 @@ RUN apt-get update \
       python-apt \
       git-core \
       openssh-client \
+      curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
     && apt-get clean
 
 CMD ["ansible-playbook", "--help"]

ubuntu-20.04/Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+      software-properties-common \
+      apt-utils \
+      ansible \
+      python-apt \
+      git-core \
+      openssh-client \
+      curl \
+    && curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss \
+    && chmod +rx /usr/local/bin/goss \
+    && apt-get clean
+
+CMD ["ansible-playbook", "--help"]