From dd7d469e2c9106a083ab00b46181ceb30ab9a112 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 15:53:49 +0200 Subject: [PATCH 1/7] feat: build base image for rh8 --- .drone.jsonnet | 183 +++++++++++++++++++ .drone.yml | 333 +++++++++++++++++++++-------------- Dockerfile => Dockerfile.rh7 | 0 Dockerfile.rh8 | 51 ++++++ README.md | 4 +- renovate.json | 4 + 6 files changed, 439 insertions(+), 136 deletions(-) create mode 100644 .drone.jsonnet rename Dockerfile => Dockerfile.rh7 (100%) create mode 100644 Dockerfile.rh8 create mode 100644 renovate.json diff --git a/.drone.jsonnet b/.drone.jsonnet new file mode 100644 index 0000000..757680b --- /dev/null +++ b/.drone.jsonnet @@ -0,0 +1,183 @@ +local PipelineTest = { + kind: 'pipeline', + name: 'test', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'markdownlint', + image: 'thegeeklab/markdownlint-cli', + commands: [ + "markdownlint 'README.md'", + ], + }, + ], + trigger: { + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], + }, +}; + +local PipelineBuildContainer(version='7') = { + kind: 'pipeline', + name: 'build-container-rh' + version, + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + name: 'dryrun', + image: 'thegeeklab/drone-docker-buildx:20', + pull: 'always', + settings: { + dry_run: true, + dockerfile: 'Dockerfile.rh' + version, + repo: 'thegeeklab/${DRONE_REPO_NAME}', + }, + depends_on: ['tags'], + when: { + ref: ['refs/pull/**'], + }, + }, + { + name: 'publish-dockerhub', + image: 'thegeeklab/drone-docker-buildx:20', + pull: 'always', + settings: { + dockerfile: 'Dockerfile.rh' + version, + repo: 'thegeeklab/${DRONE_REPO_NAME}', + username: { from_secret: 'docker_username' }, + password: { from_secret: 'docker_password' }, + }, + when: { + ref: ['refs/heads/main', 'refs/tags/**'], + }, + depends_on: ['tags'], + }, + { + name: 'publish-quay', + image: 'thegeeklab/drone-docker-buildx:20', + pull: 'always', + settings: { + dockerfile: 'Dockerfile.rh' + version, + registry: 'quay.io', + repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', + username: { from_secret: 'quay_username' }, + password: { from_secret: 'quay_password' }, + }, + when: { + ref: ['refs/heads/main', 'refs/tags/**'], + }, + depends_on: ['tags'], + }, + ], + depends_on: [ + 'test', + ], + trigger: { + ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'], + }, +}; + +local PipelineNotifications = { + kind: 'pipeline', + name: 'notifications', + platform: { + os: 'linux', + arch: 'amd64', + }, + steps: [ + { + image: 'plugins/manifest', + name: 'manifest-dockerhub', + settings: { + ignore_missing: true, + username: { from_secret: 'docker_username' }, + password: { from_secret: 'docker_password' }, + spec: 'manifest.tmpl', + }, + when: { + status: ['success'], + }, + }, + { + image: 'plugins/manifest', + name: 'manifest-quay', + settings: { + ignore_missing: true, + username: { from_secret: 'quay_username' }, + password: { from_secret: 'quay_password' }, + spec: 'manifest-quay.tmpl', + }, + when: { + status: ['success'], + }, + }, + { + name: 'pushrm-dockerhub', + pull: 'always', + image: 'chko/docker-pushrm:1', + environment: { + DOCKER_PASS: { + from_secret: 'docker_password', + }, + DOCKER_USER: { + from_secret: 'docker_username', + }, + PUSHRM_FILE: 'README.md', + PUSHRM_SHORT: 'Rootless Alpine base image', + PUSHRM_TARGET: 'thegeeklab/${DRONE_REPO_NAME}', + }, + when: { + status: ['success'], + }, + }, + { + name: 'pushrm-quay', + pull: 'always', + image: 'chko/docker-pushrm:1', + environment: { + APIKEY__QUAY_IO: { + from_secret: 'quay_token', + }, + PUSHRM_FILE: 'README.md', + PUSHRM_TARGET: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', + }, + when: { + status: ['success'], + }, + }, + { + name: 'matrix', + image: 'thegeeklab/drone-matrix', + settings: { + homeserver: { from_secret: 'matrix_homeserver' }, + roomid: { from_secret: 'matrix_roomid' }, + template: 'Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}', + username: { from_secret: 'matrix_username' }, + password: { from_secret: 'matrix_password' }, + }, + when: { + status: ['success', 'failure'], + }, + }, + ], + depends_on: [ + 'build-container-amd64', + 'build-container-arm64', + 'build-container-arm', + ], + trigger: { + ref: ['refs/heads/main', 'refs/tags/**'], + status: ['success', 'failure'], + }, +}; + +[ + PipelineTest, + PipelineBuildContainer(version='7'), + PipelineBuildContainer(version='8'), + PipelineNotifications, +] diff --git a/.drone.yml b/.drone.yml index 14aa611..5b87465 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,111 +7,148 @@ platform: arch: amd64 steps: -- name: markdownlint - image: thegeeklab/markdownlint-cli - commands: - - markdownlint 'README.md' + - name: markdownlint + image: thegeeklab/markdownlint-cli + commands: + - markdownlint 'README.md' trigger: ref: - - refs/heads/main - - refs/pull/** - - refs/tags/** + - refs/heads/main + - refs/tags/** + - refs/pull/** --- kind: pipeline -name: build-container +name: build-container-rh7 platform: os: linux arch: amd64 steps: -- name: dryrun - image: thegeeklab/drone-docker-buildx:20 - settings: - dockerfile: Dockerfile - dry_run: true - password: - from_secret: docker_password - repo: thegeeklab/${DRONE_REPO_NAME} - username: - from_secret: docker_username - when: - ref: - - refs/pull/** + - name: dryrun + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh7 + dry_run: true + repo: thegeeklab/${DRONE_REPO_NAME} + when: + ref: + - refs/pull/** + depends_on: + - tags + + - name: publish-dockerhub + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh7 + password: + from_secret: docker_password + repo: thegeeklab/${DRONE_REPO_NAME} + username: + from_secret: docker_username + when: + ref: + - refs/heads/main + - refs/tags/** + depends_on: + - tags + + - name: publish-quay + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh7 + password: + from_secret: quay_password + registry: quay.io + repo: quay.io/thegeeklab/${DRONE_REPO_NAME} + username: + from_secret: quay_username + when: + ref: + - refs/heads/main + - refs/tags/** + depends_on: + - tags -- name: tags - image: thegeeklab/docker-autotag - environment: - DOCKER_AUTOTAG_FORCE_LATEST: True - DOCKER_AUTOTAG_IGNORE_PRERELEASE: True - DOCKER_AUTOTAG_OUTPUT_FILE: .tags - DOCKER_AUTOTAG_VERSION: ${DRONE_TAG} - when: - ref: - - refs/heads/main - - refs/tags/** - depends_on: - - dryrun - -- name: publish-dockerhub - image: thegeeklab/drone-docker-buildx:20 - settings: - dockerfile: Dockerfile - password: - from_secret: docker_password - repo: thegeeklab/${DRONE_REPO_NAME} - username: - from_secret: docker_username - when: - ref: - - refs/heads/main - - refs/tags/** - depends_on: - - tags - -- name: publish-quay - image: thegeeklab/drone-docker-buildx:20 - settings: - dockerfile: Dockerfile - password: - from_secret: quay_password - registry: quay.io - repo: quay.io/thegeeklab/${DRONE_REPO_NAME} - username: - from_secret: quay_username - when: - ref: +trigger: + ref: - refs/heads/main - refs/tags/** - depends_on: - - tags - -- name: publish-gitea - image: plugins/gitea-release - settings: - api_key: - from_secret: gitea_token - base_url: https://gitea.rknet.org - note: CHANGELOG.md - overwrite: true - title: ${DRONE_TAG} - when: - ref: - - refs/tags/** - depends_on: - - publish-dockerhub - - publish-quay + - refs/pull/** + +depends_on: + - test + +--- +kind: pipeline +name: build-container-rh8 + +platform: + os: linux + arch: amd64 + +steps: + - name: dryrun + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh8 + dry_run: true + repo: thegeeklab/${DRONE_REPO_NAME} + when: + ref: + - refs/pull/** + depends_on: + - tags + + - name: publish-dockerhub + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh8 + password: + from_secret: docker_password + repo: thegeeklab/${DRONE_REPO_NAME} + username: + from_secret: docker_username + when: + ref: + - refs/heads/main + - refs/tags/** + depends_on: + - tags + + - name: publish-quay + pull: always + image: thegeeklab/drone-docker-buildx:20 + settings: + dockerfile: Dockerfile.rh8 + password: + from_secret: quay_password + registry: quay.io + repo: quay.io/thegeeklab/${DRONE_REPO_NAME} + username: + from_secret: quay_username + when: + ref: + - refs/heads/main + - refs/tags/** + depends_on: + - tags trigger: ref: - - refs/heads/main - - refs/pull/** - - refs/tags/** + - refs/heads/main + - refs/tags/** + - refs/pull/** depends_on: -- test + - test --- kind: pipeline @@ -122,63 +159,91 @@ platform: arch: amd64 steps: -- name: pushrm-dockerhub - pull: always - image: chko/docker-pushrm:1 - environment: - DOCKER_PASS: - from_secret: docker_password - DOCKER_USER: - from_secret: docker_username - PUSHRM_FILE: README.md - PUSHRM_SHORT: CentOS 7 image to build RPM packages - PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME} - when: - status: - - success - -- name: pushrm-quay - pull: always - image: chko/docker-pushrm:1 - environment: - APIKEY__QUAY_IO: - from_secret: quay_token - PUSHRM_FILE: README.md - PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME} - when: - status: - - success - -- name: matrix - image: plugins/matrix - settings: - homeserver: - from_secret: matrix_homeserver - password: - from_secret: matrix_password - roomid: - from_secret: matrix_roomid - template: "Status: **{{ build.status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}
Message: {{ build.message }}" - username: - from_secret: matrix_username - when: - status: - - success - - failure + - name: manifest-dockerhub + image: plugins/manifest + settings: + ignore_missing: true + password: + from_secret: docker_password + spec: manifest.tmpl + username: + from_secret: docker_username + when: + status: + - success + + - name: manifest-quay + image: plugins/manifest + settings: + ignore_missing: true + password: + from_secret: quay_password + spec: manifest-quay.tmpl + username: + from_secret: quay_username + when: + status: + - success + + - name: pushrm-dockerhub + pull: always + image: chko/docker-pushrm:1 + environment: + DOCKER_PASS: + from_secret: docker_password + DOCKER_USER: + from_secret: docker_username + PUSHRM_FILE: README.md + PUSHRM_SHORT: Rootless Alpine base image + PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME} + when: + status: + - success + + - name: pushrm-quay + pull: always + image: chko/docker-pushrm:1 + environment: + APIKEY__QUAY_IO: + from_secret: quay_token + PUSHRM_FILE: README.md + PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME} + when: + status: + - success + + - name: matrix + image: thegeeklab/drone-matrix + settings: + homeserver: + from_secret: matrix_homeserver + password: + from_secret: matrix_password + roomid: + from_secret: matrix_roomid + template: "Status: **{{ build.Status }}**
Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.Link }}){{#if build.Branch}} ({{ build.Branch }}){{/if}} by {{ commit.Author }}
Message: {{ commit.Message.Title }}" + username: + from_secret: matrix_username + when: + status: + - success + - failure trigger: ref: - - refs/heads/main - - refs/tags/** + - refs/heads/main + - refs/tags/** status: - - success - - failure + - success + - failure depends_on: -- build-container + - build-container-amd64 + - build-container-arm64 + - build-container-arm --- kind: signature -hmac: f3a932f626d5aab6054e52d4419f9b6eacd25e52dec3ab9a9f0335acd5433e73 +hmac: 2b3a8b24f8cd073563d652dbad1ca02eb0cc7a41d666b0891bf7f5c268214362 ... diff --git a/Dockerfile b/Dockerfile.rh7 similarity index 100% rename from Dockerfile rename to Dockerfile.rh7 diff --git a/Dockerfile.rh8 b/Dockerfile.rh8 new file mode 100644 index 0000000..e578309 --- /dev/null +++ b/Dockerfile.rh8 @@ -0,0 +1,51 @@ +FROM rockylinux/rockylinux:8 + +LABEL maintainer="Robert Kaussow " +LABEL org.opencontainers.image.authors="Robert Kaussow " +LABEL org.opencontainers.image.title="rpmbuild" +LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/rpmbuild" +LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/rpmbuild" +LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/rpmbuild" + +ENV RPMBUILD_BASE_DIR=/drone/src + +RUN yum install -q -y \ + dash \ + ca-certificates \ + gcc gcc-c++ \ + gnutls \ + gnutls-devel \ + libtool libtool-ltdl \ + pam-devel \ + dbus-devel \ + avahi-devel \ + systemd-devel \ + make cmake \ + git \ + bzip2 \ + bzip2-devel \ + freetype-devel \ + fribidi-devel \ + expat-devel \ + gperf \ + nasm \ + perl \ + python \ + yasm \ + which \ + libva-devel \ + zlib-devel \ + pkgconfig \ + wget curl \ + automake autoconf \ + yum-utils rpm-build rpmdevtools \ + epel-release && \ + rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 && \ + yum clean all + +ADD overlay/ / + +USER root + +WORKDIR ${RPMBUILD_BASE_DIR} +CMD [] diff --git a/README.md b/README.md index 85bfdfa..c15b518 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # rpmbuild -CentOS 7 image to build RPM packages +Base image to build RPM packages [![Build Status](https://img.shields.io/drone/build/docker/rpmbuild?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/rpmbuild) [![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/rpmbuild) @@ -8,7 +8,7 @@ CentOS 7 image to build RPM packages [![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/rpmbuild) [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/rpmbuild/src/branch/main/LICENSE) -Simple Docker image based on CentOS 7 to build RPM packages. +Simple Docker images based on CentOS 7/Rocky Linux 8 to build RPM packages. ## Environment variables diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..5f02575 --- /dev/null +++ b/renovate.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": ["github>thegeeklab/renovate-presets:docker"] +} -- 2.24.4 From 9ce81bda2655977ac33d98f78707a451246ca82e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 15:55:08 +0200 Subject: [PATCH 2/7] fix pipeline deps --- .drone.jsonnet | 5 ++--- .drone.yml | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 757680b..3e82d05 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -165,9 +165,8 @@ local PipelineNotifications = { }, ], depends_on: [ - 'build-container-amd64', - 'build-container-arm64', - 'build-container-arm', + 'build-container-rh7', + 'build-container-rh8', ], trigger: { ref: ['refs/heads/main', 'refs/tags/**'], diff --git a/.drone.yml b/.drone.yml index 5b87465..aad8fee 100644 --- a/.drone.yml +++ b/.drone.yml @@ -238,12 +238,11 @@ trigger: - failure depends_on: - - build-container-amd64 - - build-container-arm64 - - build-container-arm + - build-container-rh7 + - build-container-rh8 --- kind: signature -hmac: 2b3a8b24f8cd073563d652dbad1ca02eb0cc7a41d666b0891bf7f5c268214362 +hmac: c2cef2a4ff6e190ccbccf680b81245da0050d4c750028073329e83cc6bbb636c ... -- 2.24.4 From dec9f4fbdc68f4edb904febad252d1c4845dd6be Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 15:57:00 +0200 Subject: [PATCH 3/7] fix pipeline deps --- .drone.jsonnet | 3 --- .drone.yml | 14 +------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 3e82d05..77200d9 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -36,7 +36,6 @@ local PipelineBuildContainer(version='7') = { dockerfile: 'Dockerfile.rh' + version, repo: 'thegeeklab/${DRONE_REPO_NAME}', }, - depends_on: ['tags'], when: { ref: ['refs/pull/**'], }, @@ -54,7 +53,6 @@ local PipelineBuildContainer(version='7') = { when: { ref: ['refs/heads/main', 'refs/tags/**'], }, - depends_on: ['tags'], }, { name: 'publish-quay', @@ -70,7 +68,6 @@ local PipelineBuildContainer(version='7') = { when: { ref: ['refs/heads/main', 'refs/tags/**'], }, - depends_on: ['tags'], }, ], depends_on: [ diff --git a/.drone.yml b/.drone.yml index aad8fee..de011a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,8 +37,6 @@ steps: when: ref: - refs/pull/** - depends_on: - - tags - name: publish-dockerhub pull: always @@ -54,8 +52,6 @@ steps: ref: - refs/heads/main - refs/tags/** - depends_on: - - tags - name: publish-quay pull: always @@ -72,8 +68,6 @@ steps: ref: - refs/heads/main - refs/tags/** - depends_on: - - tags trigger: ref: @@ -103,8 +97,6 @@ steps: when: ref: - refs/pull/** - depends_on: - - tags - name: publish-dockerhub pull: always @@ -120,8 +112,6 @@ steps: ref: - refs/heads/main - refs/tags/** - depends_on: - - tags - name: publish-quay pull: always @@ -138,8 +128,6 @@ steps: ref: - refs/heads/main - refs/tags/** - depends_on: - - tags trigger: ref: @@ -243,6 +231,6 @@ depends_on: --- kind: signature -hmac: c2cef2a4ff6e190ccbccf680b81245da0050d4c750028073329e83cc6bbb636c +hmac: 17c04d68792bb5d1489ece943dc756b703294d42f407285f43ca39e429578d3f ... -- 2.24.4 From 23c2d73c5c065c864c6944d96e2533ce0cb15ffb Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:00:26 +0200 Subject: [PATCH 4/7] use version tags --- .drone.jsonnet | 1 + .drone.yml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 77200d9..090f0c2 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -64,6 +64,7 @@ local PipelineBuildContainer(version='7') = { repo: 'quay.io/thegeeklab/${DRONE_REPO_NAME}', username: { from_secret: 'quay_username' }, password: { from_secret: 'quay_password' }, + tags: version, }, when: { ref: ['refs/heads/main', 'refs/tags/**'], diff --git a/.drone.yml b/.drone.yml index de011a6..c680ce6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,6 +62,7 @@ steps: from_secret: quay_password registry: quay.io repo: quay.io/thegeeklab/${DRONE_REPO_NAME} + tags: 7 username: from_secret: quay_username when: @@ -122,6 +123,7 @@ steps: from_secret: quay_password registry: quay.io repo: quay.io/thegeeklab/${DRONE_REPO_NAME} + tags: 8 username: from_secret: quay_username when: @@ -231,6 +233,6 @@ depends_on: --- kind: signature -hmac: 17c04d68792bb5d1489ece943dc756b703294d42f407285f43ca39e429578d3f +hmac: 474bbbb50ad73c8e3fb3c9047caabeefaf91f311582963e508503405b652af5d ... -- 2.24.4 From acc5e1f73cba46172012c3d6f4010d0c191ea352 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:11:44 +0200 Subject: [PATCH 5/7] fix package installation --- Dockerfile.rh7 | 8 +++++--- Dockerfile.rh8 | 15 +++++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Dockerfile.rh7 b/Dockerfile.rh7 index db2c091..cf6505f 100644 --- a/Dockerfile.rh7 +++ b/Dockerfile.rh7 @@ -9,6 +9,10 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/rpm ENV RPMBUILD_BASE_DIR=/drone/src +RUN yum install -q -y \ + epel-release \ + yum-utils && \ + rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \ RUN yum install -q -y \ dash \ ca-certificates \ @@ -38,9 +42,7 @@ RUN yum install -q -y \ pkgconfig \ wget curl \ automake autoconf \ - yum-utils rpm-build rpmdevtools \ - epel-release && \ - rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \ + rpm-build rpmdevtools \ yum clean all ADD overlay/ / diff --git a/Dockerfile.rh8 b/Dockerfile.rh8 index e578309..b291d81 100644 --- a/Dockerfile.rh8 +++ b/Dockerfile.rh8 @@ -9,7 +9,12 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/rpm ENV RPMBUILD_BASE_DIR=/drone/src -RUN yum install -q -y \ +RUN dnf install -q -y \ + epel-release \ + dnf-utils dnf-plugins-core && \ + rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \ + dnf config-manager --set-enabled powertools +RUN dnf install -q -y \ dash \ ca-certificates \ gcc gcc-c++ \ @@ -30,7 +35,7 @@ RUN yum install -q -y \ gperf \ nasm \ perl \ - python \ + python3 \ yasm \ which \ libva-devel \ @@ -38,10 +43,8 @@ RUN yum install -q -y \ pkgconfig \ wget curl \ automake autoconf \ - yum-utils rpm-build rpmdevtools \ - epel-release && \ - rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8 && \ - yum clean all + rpm-build rpmdevtools \ + dnf clean all ADD overlay/ / -- 2.24.4 From 8953a2d28d9cb63459f05ed8f753e9e6d0c79b87 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:12:50 +0200 Subject: [PATCH 6/7] fix package installation --- Dockerfile.rh7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.rh7 b/Dockerfile.rh7 index cf6505f..9738436 100644 --- a/Dockerfile.rh7 +++ b/Dockerfile.rh7 @@ -12,7 +12,7 @@ ENV RPMBUILD_BASE_DIR=/drone/src RUN yum install -q -y \ epel-release \ yum-utils && \ - rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 && \ + rpm --import https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 RUN yum install -q -y \ dash \ ca-certificates \ -- 2.24.4 From 77478cb76d942d01ff67162fff00d37d64d68a32 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sat, 23 Oct 2021 16:14:08 +0200 Subject: [PATCH 7/7] fix package installation --- Dockerfile.rh7 | 2 +- Dockerfile.rh8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.rh7 b/Dockerfile.rh7 index 9738436..cf136cd 100644 --- a/Dockerfile.rh7 +++ b/Dockerfile.rh7 @@ -42,7 +42,7 @@ RUN yum install -q -y \ pkgconfig \ wget curl \ automake autoconf \ - rpm-build rpmdevtools \ + rpm-build rpmdevtools && \ yum clean all ADD overlay/ / diff --git a/Dockerfile.rh8 b/Dockerfile.rh8 index b291d81..511c489 100644 --- a/Dockerfile.rh8 +++ b/Dockerfile.rh8 @@ -43,7 +43,7 @@ RUN dnf install -q -y \ pkgconfig \ wget curl \ automake autoconf \ - rpm-build rpmdevtools \ + rpm-build rpmdevtools && \ dnf clean all ADD overlay/ / -- 2.24.4