welp drones jsonnet support does seem to lack a few things

.drone.jsonnet

@@ -0,0 +1,44 @@
+local Pipeline(tag) = {
+  kind: "pipeline",
+  type: "kubernetes",
+  name: tag + "build",
+  platform: {
+    os: "linux",
+    arch: "amd64",
+  },
+  steps: [
+    {
+      name: tag,
+      image: "plugins/kaniko",
+      settings: {
+        repo: "lerentis/ansible",
+        username: { "from_secret": "docker_username" },
+        password: { "from_secret": "docker_password" },
+        dockerfile: tag + "/Dockerfile",
+        tags: [ tag ],
+      },
+      resources: {
+        limits: {
+          cpu: "200",
+          memory: "1024MiB",
+        },
+      },
+      when: [ "push", "pull_request", "cron" ]
+    }
+  ]
+};
+
+
+[
+  Pipeline("ubuntu-20.04"),
+  Pipeline("ubuntu-18.04"),
+  Pipeline("ubuntu-14.04"),
+  Pipeline("debian-8"),
+  Pipeline("debian-9"),
+  Pipeline("debian-10"),
+  Pipeline("centos-7"),
+  Pipeline("almalinux-8"),
+  Pipeline("fedora-24"),
+  Pipeline("alpine-3"),
+  Pipeline("arch"),
+]

.drone.yml

@@ -1,304 +1,632 @@
 ---
 kind: pipeline
-name: ansible-containers
+type: kubernetes
+name: build-debian
 
 platform:
   os: linux
   arch: amd64
 
-concurrency:
-  limit: 9
+steps:
+
+- name: build-ubuntu-20
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-20.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-20.04-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-18
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-18.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-18.04-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-16
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-16.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-16.04-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-14
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-14.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-14.04-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-8
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-8-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-9
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-9/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-9-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-10
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-10/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-10-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: build-rhel
+
+platform:
+  os: linux
+  arch: amd64
 
 steps:
 
-- name: build-ubuntu-19
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-19.04/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: ubuntu-19.04
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-ubuntu-18
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-18.04/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: ubuntu-18.04
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-ubuntu-16
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-16.04/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: ubuntu-16.04
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-ubuntu-14
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-14.04/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: ubuntu-14.04
-  when:
-    event:
-    - push
-    - pull_request
-
 - name: build-fedora-24
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: fedora-24/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: fedora-24
+    tags: 
+      - fedora-24-dev
   when:
     event:
     - push
     - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
 
-- name: build-alpine-3
-  image: plugins/docker
+- name: build-almalinux-8
+  image: plugins/kaniko
   settings:
-    dockerfile: alpine-3/Dockerfile
-    dry_run: true
+    dockerfile: almalinux-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: alpine-3
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-debian-8
-  image: plugins/docker
-  settings:
-    dockerfile: debian-8/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: debian-8
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-debian-7
-  image: plugins/docker
-  settings:
-    dockerfile: debian-8/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: debian-7
+    tags: 
+      - almalinux-8-dev
   when:
     event:
     - push
     - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
 
 - name: build-centos-7
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: centos-7/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: centos-7
+    tags: 
+      - centos-7-dev
   when:
     event:
     - push
     - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
 
-- name: build-arch
-  image: plugins/docker
-  settings:
-    dockerfile: arch/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: arch
-  when:
-    event:
-    - push
-    - pull_request
+---
+kind: pipeline
+type: kubernetes
+name: build-alpine
 
-- name: build-ubuntu-18-publish
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-18.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-18.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
+platform:
+  os: linux
+  arch: amd64
 
-- name: build-ubuntu-19-publish
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-19.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-19.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
+steps:
 
-- name: build-ubuntu-16-publish
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-16.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-16.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-ubuntu-14-publish
-  image: plugins/docker
-  settings:
-    dockerfile: ubuntu-14.04/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: ubuntu-14.04
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-fedora-24-publish
-  image: plugins/docker
-  settings:
-    dockerfile: fedora-24/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: fedora-24
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-alpine-3-publish
-  image: plugins/docker
+- name: build-alpine-3
+  image: plugins/kaniko
   settings:
     dockerfile: alpine-3/Dockerfile
     password:
       from_secret: docker_password
-    repo: lerentis/ansible
-    tag: alpine-3
     username:
       from_secret: docker_username
-  when:
-    event:
-    - tag
-
-- name: build-debian-8-publish
-  image: plugins/docker
-  settings:
-    dockerfile: debian-8/Dockerfile
-    password:
-      from_secret: docker_password
     repo: lerentis/ansible
-    tag: debian-8
-    username:
-      from_secret: docker_username
+    tags: 
+      - alpine-3-dev
   when:
     event:
-    - tag
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
 
-- name: build-debian-7-publish
-  image: plugins/docker
-  settings:
-    dockerfile: debian-8/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: debian-7
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
+---
+kind: pipeline
+type: kubernetes
+name: build-arch
 
-- name: build-centos-7-publish
-  image: plugins/docker
-  settings:
-    dockerfile: centos-7/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: centos-7
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
+platform:
+  os: linux
+  arch: amd64
 
-- name: build-arch-publish
-  image: plugins/docker
+steps:
+
+- name: build-arch
+  image: plugins/kaniko
   settings:
     dockerfile: arch/Dockerfile
     password:
       from_secret: docker_password
-    repo: lerentis/ansible
-    tag: arch
     username:
       from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - arch-dev
+  when:
+    event:
+    - push
+    - pull_request
+    - cron
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: release-debian
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: build-ubuntu-20-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-20.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-20.04
   when:
     event:
     - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-18-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-18.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-18.04
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-16-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-16.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-16.04
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-ubuntu-14-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: ubuntu-14.04/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - ubuntu-14.04
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-8-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-8
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-9-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-9/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-9
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-debian-10-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: debian-10/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - debian-10
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: release-rhel
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: build-fedora-24-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: fedora-24/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - fedora-24
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-almalinux-8-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: almalinux-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - almalinux-8
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+- name: build-centos-7-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: centos-7/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - centos-7
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: release-alpine
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: build-alpine-3-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: alpine-3/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - alpine-3
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: release-arch
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: build-arch-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: arch/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - arch
+  when:
+    event:
+    - tag
+  resources:
+    limits:
+      cpu: 200
+      memory: 1024MiB
+
+---
+kind: pipeline
+type: kubernetes
+name: notify-build
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
 
 - name: notify
   image: appleboy/drone-telegram
   settings:
-    message: "Commit {{ commit.link }} ran with build {{ build.number }} and finished with status {{ build.status }}."
-    to: 14852963
-    token: 335668211:AAF-YgId7iI6ANBuZVy4uVOYYqA4R4uAaqY
+    message: "Commit {{ commit.message }} ran with build {{ build.number }} and finished with status {{ build.status }}."
+    to: 
+      from_secret: telegram_userid
+    token:
+      from_secret: telegram_secret
   when:
     status:
     - failure
     - success
-  depends_on:
-  - build-ubuntu-19
-  - build-ubuntu-18
-  - build-ubuntu-16
-  - build-ubuntu-14
-  - build-fedora-24
-  - build-alpine-3
-  - build-debian-8
-  - build-debian-7
-  - build-centos-7
+    event:
+    - push
+    - pull_request
+    - cron
+depends_on:
   - build-arch
-  - build-ubuntu-19-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-centos-7-publish
-  - build-arch-publish
+  - build-alpine
+  - build-debian
+  - build-rhel
+
+---
+kind: pipeline
+type: kubernetes
+name: notify-release
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: notify
+  image: appleboy/drone-telegram
+  settings:
+    message: "Release {{ build.tag }} ran with build {{ build.number }} and finished with status {{ build.status }}."
+    to: 
+      from_secret: telegram_userid
+    token:
+      from_secret: telegram_secret
+  when:
+    status:
+    - failure
+    - success
+    event:
+    - tag
+
+depends_on:
+  - release-arch
+  - release-alpine
+  - release-debian
+  - release-rhel

README.md

@@ -1,6 +1,6 @@
 # ansible  
 
-[![Build Status](https://drone.burntbunch.org/api/badges/lerentis/ansible-container/status.svg)](https://drone.burntbunch.org/lerentis/ansible-container)
+[![Build Status](https://drone.uploadfilter24.eu/api/badges/lerentis/ansible/status.svg)](https://drone.uploadfilter24.eu/lerentis/ansible)
 
 Docker images for running and testing ansible playbooks with various operating systems.
 This Project is based on this [project](https://github.com/pauvos/ansible), which seems abandoned
@@ -10,11 +10,12 @@ Available operating systems:
 
 * alpine-3
 * centos-7
+* almalinux-8
 * debian-8
 * fedora-24
 * ubuntu-16.04
 * ubuntu-18.04
-* ubuntu-19.04
+* ubuntu-20.04
 * arch
 
 ## run playbooks
@@ -69,6 +70,6 @@ Note: /root/.ansible must not be an overlayfs, otherwise ssh accelerate won't wo
 
 ## references
 
-* [project](https://git.burntbunch.org/lerentis/ansible-container)
+* [project](https://git.uploadfilter24.eu/lerentis/ansible)
 
 Current Version: 0.7.2

almalinux-8/Dockerfile

@@ -0,0 +1,10 @@
+FROM almalinux:8
+
+RUN dnf -y install python3-pip epel-release \
+    && dnf install -y 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"]

alpine-3/Dockerfile

@@ -1,5 +1,7 @@
-FROM alpine:3.4
+FROM alpine:3.14
 
-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
+FROM archlinux:latest
 
-RUN pacman -Syuu --noconfirm && pacman -S python2 ansible sshpass git python2-passlib python2-netaddr --noconfirm
+RUN pacman -Syuu --noconfirm && pacman -S python python2 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,12 @@
 #!/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-20.04  && docker buildx build -t lerentis/ansible:ubuntu-20.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
+cd ../fedora-24 && docker buildx build -t lerentis/ansible:fedora-24 --platform=linux/amd64 . --push
+cd ../debian-9 && docker buildx build -t lerentis/ansible:debian-9 --platform=linux/arm,linux/amd64 . --push
+cd ../debian-8 && docker buildx build -t lerentis/ansible:debian-8 --platform=linux/arm,linux/amd64 . --push
+cd ../debian-10 && docker buildx build -t lerentis/ansible:debian-10 --platform=linux/arm64,linux/amd64 . --push
+cd ../centos-7 && docker buildx build -t lerentis/ansible:centos-7 --platform=linux/arm64,linux/amd64 . --push
+cd ../almalinux-8 && docker buildx build -t lerentis/ansible:almalinux-8 --platform=linux/arm64,linux/amd64 . --push
+cd ../arch && docker buildx build -t lerentis/ansible:arch --platform=linux/arm,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
 

debian-10/Dockerfile

@@ -0,0 +1,22 @@
+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 \
+      ca-certificates \
+    && 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-19.04/Dockerfile

@@ -1,16 +0,0 @@
-FROM ubuntu:19.04
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-      software-properties-common \
-      apt-utils \
-    && apt-add-repository ppa:ansible/ansible \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-      ansible \
-      python-apt \
-      git-core \
-      openssh-client \
-    && 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"]