cleaner build

.drone.yml

@@ -1,328 +1,475 @@
 ---
 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/docker
+  image: plugins/kaniko
   settings:
     dockerfile: ubuntu-20.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-20.04
+    tags: 
+      - ubuntu-20.04-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-ubuntu-18
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: ubuntu-18.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-18.04
+    tags: 
+      - ubuntu-18.04-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-ubuntu-16
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: ubuntu-16.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-16.04
+    tags: 
+      - ubuntu-16.04-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-ubuntu-14
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: ubuntu-14.04/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: ubuntu-14.04
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-fedora-24
-  image: plugins/docker
-  settings:
-    dockerfile: fedora-24/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: fedora-24
-  when:
-    event:
-    - push
-    - pull_request
-
-- name: build-alpine-3
-  image: plugins/docker
-  settings:
-    dockerfile: alpine-3/Dockerfile
-    dry_run: true
-    repo: lerentis/ansible
-    tag: alpine-3
+    tags: 
+      - ubuntu-14.04-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-debian-8
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: debian-8/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-8
+    tags: 
+      - debian-8-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-debian-9
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: debian-9/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-9
+    tags: 
+      - debian-9-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-debian-10
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: debian-10/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: debian-10
+    tags: 
+      - debian-10-dev
+  when:
+    event:
+    - push
+    - pull_request
+
+---
+kind: pipeline
+type: kubernetes
+name: build-rhel
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: build-fedora-24
+  image: plugins/kaniko
+  settings:
+    dockerfile: fedora-24/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - fedora-24-dev
   when:
     event:
     - push
     - pull_request
 
 - name: build-centos-8
-  image: plugins/docker
+  image: plugins/kaniko
   settings:
     dockerfile: centos-8/Dockerfile
-    dry_run: true
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
     repo: lerentis/ansible
-    tag: centos-8
+    tags: 
+      - centos-8-dev
   when:
     event:
     - push
     - pull_request
 
 - 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
 
-- 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-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
+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
 
-- name: build-debian-9-publish
-  image: plugins/docker
-  settings:
-    dockerfile: debian-9/Dockerfile
-    password:
-      from_secret: docker_password
-    repo: lerentis/ansible
-    tag: debian-9
-    username:
-      from_secret: docker_username
-  when:
-    event:
-    - tag
+---
+kind: pipeline
+type: kubernetes
+name: build-arch
 
-- 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:
-    event:
-    - tag
+platform:
+  os: linux
+  arch: amd64
 
-- 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
+steps:
 
-- 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
+- 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
+
+---
+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
 
+- 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
+
+- 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
+
+- 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
+
+- 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
+
+- 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
+
+- 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
+
+---
+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
+
+- name: build-centos-8-release
+  image: plugins/kaniko
+  settings:
+    dockerfile: centos-8/Dockerfile
+    password:
+      from_secret: docker_password
+    username:
+      from_secret: docker_username
+    repo: lerentis/ansible
+    tags: 
+      - centos-8
+  when:
+    event:
+    - tag
+
+- 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
+
+---
+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
+
+---
+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
+
+
+---
+kind: pipeline
+type: kubernetes
+name: notify-build
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
 - name: notify
   image: appleboy/drone-telegram
   settings:
@@ -333,28 +480,41 @@ steps:
     status:
     - 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-9
-  - build-debian-10
-  - build-centos-7
-  - build-centos-8
+    event:
+    - push
+    - pull_request
+depends_on:
   - 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-9-publish
-  - build-debian-10-publish
-  - build-centos-7-publish
-  - build-centos-8-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: "Commit {{ commit.link }} ran with build {{ build.number }} and finished with status {{ build.status }}."
+    to: 14852963
+    token: 335668211:AAF-YgId7iI6ANBuZVy4uVOYYqA4R4uAaqY
+  when:
+    status:
+    - failure
+    - success
+    event:
+    - tag
+
+depends_on:
+  - release-arch
+  - release-alpine
+  - release-debian
+  - release-rhel

alpine-3/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.14
 
 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 \

arch/Dockerfile

@@ -1,6 +1,6 @@
-FROM archlinux/base
+FROM archlinux:latest
 
-RUN pacman -Syuu --noconfirm && pacman -S python ansible sshpass git python-passlib python-netaddr curl --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
 

build-all.sh

@@ -2,9 +2,11 @@
 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 ../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-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
+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 ../centos-8 && docker buildx build -t lerentis/ansible:centos-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,7 @@
 FROM centos:7
 
 RUN yum -y install epel-release \
-  && yum -y install ansible git curl \
+  && 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 \

centos-8/Dockerfile

@@ -4,6 +4,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
+    && chmod +rx /usr/local/bin/goss \
+    && touch ~/.netrc && chmod og-rw ~/.netrc \
+    && pip3 install firewall
 
 CMD ["ansible-playbook", "--help"]

debian-10/Dockerfile

@@ -12,6 +12,8 @@ RUN apt-get -q update \
       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 

debian-8/Dockerfile

@@ -11,9 +11,16 @@ RUN apt-get -q update \
       git \
       apt-utils \
       curl \
-      ansible \
+      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

@@ -11,11 +11,16 @@ RUN apt-get -q update \
       git \
       apt-utils \
       curl \
-      ansible \
+      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 \
-    && apt-get clean \
     && 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"]