From 0b88a350f137110d3519acd4b90058e1c249712b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 26 Jan 2021 14:05:35 +0100 Subject: [PATCH] fix: replace labels in dockerfiles --- docker/Dockerfile.linux.amd64 | 15 ++++++++++----- docker/Dockerfile.linux.arm | 15 ++++++++++----- docker/Dockerfile.linux.arm64 | 5 ++++- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index 5b494da..6e58edf 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,13 +1,18 @@ FROM plugins/base:linux-amd64 -LABEL maintainer="Drone.IO Community " \ - org.label-schema.name="Drone Ansible" \ - org.label-schema.vendor="Drone.IO Community" \ - org.label-schema.schema-version="1.0" +LABEL maintainer="ownCloud DevOps " +LABEL org.opencontainers.image.authors="ownCloud DevOps " +LABEL org.opencontainers.image.title="drone-ansible" +LABEL org.opencontainers.image.url="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.source="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.documentation="https://github.com/owncloud-ci/drone-ansible" + +# renovate: datasource=pypi depName=ansible +ENV ANSIBLE_VERSION="2.10.5" RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.5 boto3 hcloud && \ + pip3 install ansible=="${ANSIBLE_VERSION}" boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/amd64/drone-ansible /bin/ diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index dbac010..bba7011 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -1,13 +1,18 @@ FROM plugins/base:linux-arm -LABEL maintainer="Drone.IO Community " \ - org.label-schema.name="Drone Ansible" \ - org.label-schema.vendor="Drone.IO Community" \ - org.label-schema.schema-version="1.0" +LABEL maintainer="ownCloud DevOps " +LABEL org.opencontainers.image.authors="ownCloud DevOps " +LABEL org.opencontainers.image.title="drone-ansible" +LABEL org.opencontainers.image.url="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.source="https://github.com/owncloud-ci/drone-ansible" +LABEL org.opencontainers.image.documentation="https://github.com/owncloud-ci/drone-ansible" + +# renovate: datasource=pypi depName=ansible +ENV ANSIBLE_VERSION="2.10.5" RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.5 boto3 hcloud && \ + pip3 install ansible=="${ANSIBLE_VERSION}" boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/arm/drone-ansible /bin/ diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index f2d5c22..ab1e600 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -7,9 +7,12 @@ LABEL org.opencontainers.image.url="https://github.com/owncloud-ci/drone-ansible LABEL org.opencontainers.image.source="https://github.com/owncloud-ci/drone-ansible" LABEL org.opencontainers.image.documentation="https://github.com/owncloud-ci/drone-ansible" +# renovate: datasource=pypi depName=ansible +ENV ANSIBLE_VERSION="2.10.5" + RUN apk add --no-cache bash git curl rsync openssh-client sshpass py3-pip py3-requests py3-paramiko python3-dev libffi-dev libressl-dev libressl build-base && \ pip3 install -U pip && \ - pip3 install ansible==2.10.5 boto3 hcloud && \ + pip3 install ansible=="${ANSIBLE_VERSION}" boto3 hcloud && \ apk del --no-cache python3-dev libffi-dev libressl-dev build-base ADD release/linux/arm64/drone-ansible /bin/