.drone.yml

@@ -188,80 +188,17 @@ platform:
 
 steps:
 
-- name: build-fedora-34
+- name: build-fedora-24
   image: plugins/kaniko:1.4.1
   settings:
-    dockerfile: fedora-34/Dockerfile
+    dockerfile: fedora-24/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - fedora-34-dev
-  when:
-    event:
-    - push
-    - pull_request
-    - cron
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-fedora-35
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-35/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-35-dev
-  when:
-    event:
-    - push
-    - pull_request
-    - cron
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-fedora-36
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-36/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-36-dev
-  when:
-    event:
-    - push
-    - pull_request
-    - cron
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-fedora-37
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-37/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-37-dev
+      - fedora-24-dev
   when:
     event:
     - push
@@ -325,38 +262,17 @@ platform:
 
 steps:
 
-- name: build-alpine-3-14
+- name: build-alpine-3
   image: plugins/kaniko:1.4.1
   settings:
-    dockerfile: alpine-3.14/Dockerfile
+    dockerfile: alpine-3/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - alpine-3.14-dev
-  when:
-    event:
-    - push
-    - pull_request
-    - cron
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-alpine-3-15
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: alpine-3.15/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - alpine-3.15-dev
+      - alpine-3-dev
   when:
     event:
     - push
@@ -573,75 +489,17 @@ platform:
 
 steps:
 
-- name: build-fedora-34-release
+- name: build-fedora-24-release
   image: plugins/kaniko:1.4.1
   settings:
-    dockerfile: fedora-34/Dockerfile
+    dockerfile: fedora-24/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - fedora-34
-  when:
-    event:
-    - tag
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-fedora-35-release
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-35/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-35
-  when:
-    event:
-    - tag
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-
-- name: build-fedora-36-release
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-36/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-36
-  when:
-    event:
-    - tag
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-fedora-37-release
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: fedora-37/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - fedora-37
+      - fedora-24
   when:
     event:
     - tag
@@ -699,36 +557,17 @@ platform:
 
 steps:
 
-- name: build-alpine-3.14-release
+- name: build-alpine-3-release
   image: plugins/kaniko:1.4.1
   settings:
-    dockerfile: alpine-3.14/Dockerfile
+    dockerfile: alpine-3/Dockerfile
     password:
       from_secret: docker_password
     username:
       from_secret: docker_username
     repo: lerentis/ansible
     tags: 
-      - alpine-3.14
-  when:
-    event:
-    - tag
-  resources:
-    limits:
-      cpu: 200
-      memory: 1024MiB
-
-- name: build-alpine-3.15-release
-  image: plugins/kaniko:1.4.1
-  settings:
-    dockerfile: alpine-3.15/Dockerfile
-    password:
-      from_secret: docker_password
-    username:
-      from_secret: docker_username
-    repo: lerentis/ansible
-    tags: 
-      - alpine-3.15
+      - alpine-3
   when:
     event:
     - tag

alpine-3.15/Dockerfile

@@ -1,7 +0,0 @@
-FROM alpine:3.15
-
-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"]

build-all.sh

@@ -1,14 +1,9 @@
 #!/bin/bash
 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.14 && docker buildx build -t lerentis/ansible:alpine-3.14 --platform=linux/arm,linux/arm64,linux/amd64 . --push
-cd ../alpine-3.15 && docker buildx build -t lerentis/ansible:alpine-3.15 --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 ../ubuntu-22.04  && docker buildx build -t lerentis/ansible:ubuntu-22.04 --platform=linux/arm,linux/arm64,linux/amd64 . --push
-cd ../fedora-34 && docker buildx build -t lerentis/ansible:fedora-34 --platform=linux/amd64 . --push
-cd ../fedora-35 && docker buildx build -t lerentis/ansible:fedora-35 --platform=linux/amd64 . --push
-cd ../fedora-36 && docker buildx build -t lerentis/ansible:fedora-36 --platform=linux/amd64 . --push
-cd ../fedora-37 && docker buildx build -t lerentis/ansible:fedora-37 --platform=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

fedora-24/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:24
 
 RUN dnf -y install \
     ansible \

fedora-34/Dockerfile

@@ -1,11 +0,0 @@
-FROM fedora:34
-
-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"]

fedora-35/Dockerfile

@@ -1,11 +0,0 @@
-FROM fedora:35
-
-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"]

fedora-36/Dockerfile

@@ -1,11 +0,0 @@
-FROM fedora:36
-
-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-22.04/Dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update \
       software-properties-common \
       apt-utils \
       ansible \
-      python3-apt \
+      python-apt \
       git-core \
       openssh-client \
       curl \