some more rhel family love

2022-04-20 19:38:19 +02:00 · 2022-04-20 19:38:19 +02:00 · 39c7266b49
parent e854da83ca
commit 39c7266b49
6 changed files with 166 additions and 8 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -188,17 +188,80 @@ platform:

 steps:

- name: build-fedora-24
+- name: build-fedora-34
  image: plugins/kaniko:1.4.1
  settings:
-    dockerfile: fedora-24/Dockerfile
+    dockerfile: fedora-34/Dockerfile
    password:
      from_secret: docker_password
    username:
      from_secret: docker_username
    repo: lerentis/ansible
    tags: 
-      - fedora-24-dev
+      - 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
  when:
    event:
    - push
@ -489,17 +552,75 @@ platform:

 steps:

- name: build-fedora-24-release
+- name: build-fedora-34-release
  image: plugins/kaniko:1.4.1
  settings:
-    dockerfile: fedora-24/Dockerfile
+    dockerfile: fedora-34/Dockerfile
    password:
      from_secret: docker_password
    username:
      from_secret: docker_username
    repo: lerentis/ansible
    tags: 
-      - fedora-24
+      - 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
  when:
    event:
    - tag
--- a/build-all.sh
+++ b/build-all.sh
@ -3,7 +3,11 @@ cd ubuntu-18.04 && docker buildx build -t lerentis/ansible:ubuntu-18.04 --platfo
 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 ../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 ../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
--- a/fedora-34/Dockerfile
+++ b/fedora-34/Dockerfile
@ -1,4 +1,4 @@
-FROM fedora:24
+FROM fedora:34

 RUN dnf -y install \
    ansible \
--- a/fedora-35/Dockerfile
+++ b/fedora-35/Dockerfile
@ -0,0 +1,11 @@
+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"]
--- a/fedora-36/Dockerfile
+++ b/fedora-36/Dockerfile
@ -0,0 +1,11 @@
+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"]
--- a/fedora-37/Dockerfile
+++ b/fedora-37/Dockerfile
@ -0,0 +1,11 @@
+FROM fedora:37
+
+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"]