From cb08c95f102f55051a0a213c713d816b0c5bc041 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Sat, 13 Jul 2024 17:58:21 +0200 Subject: [PATCH 1/2] Replace deprecated MAINTAINER with LABEL in Dockerfiles --- integration-tests/Dockerfile_alpine3 | 2 +- integration-tests/Dockerfile_alpine3.md5 | 2 +- integration-tests/Dockerfile_centos7 | 2 +- integration-tests/Dockerfile_centos7.md5 | 2 +- integration-tests/Dockerfile_trusty | 2 +- integration-tests/Dockerfile_trusty.md5 | 2 +- integration-tests/Dockerfile_wheezy | 2 +- integration-tests/Dockerfile_wheezy.md5 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-tests/Dockerfile_alpine3 b/integration-tests/Dockerfile_alpine3 index c573021ee..dd5486743 100644 --- a/integration-tests/Dockerfile_alpine3 +++ b/integration-tests/Dockerfile_alpine3 @@ -1,5 +1,5 @@ FROM alpine:3.19 -MAINTAINER Ahmed +LABEL org.opencontainers.image.authors="Ahmed" # install apache2 and remove un-needed services RUN apk update && \ diff --git a/integration-tests/Dockerfile_alpine3.md5 b/integration-tests/Dockerfile_alpine3.md5 index f4bdce743..5500581e1 100644 --- a/integration-tests/Dockerfile_alpine3.md5 +++ b/integration-tests/Dockerfile_alpine3.md5 @@ -1 +1 @@ -f9c8c187e94693c4625a8c8d01fae3bf Dockerfile_alpine3 +3c4e7fbf89cd2edfeae94728e247213d Dockerfile_alpine3 diff --git a/integration-tests/Dockerfile_centos7 b/integration-tests/Dockerfile_centos7 index 39c22aeef..18b30e874 100644 --- a/integration-tests/Dockerfile_centos7 +++ b/integration-tests/Dockerfile_centos7 @@ -1,5 +1,5 @@ FROM centos:7.2.1511 -MAINTAINER Ahmed +LABEL org.opencontainers.image.authors="Ahmed" ENV container docker RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ diff --git a/integration-tests/Dockerfile_centos7.md5 b/integration-tests/Dockerfile_centos7.md5 index 43a835cb5..4f4be222c 100644 --- a/integration-tests/Dockerfile_centos7.md5 +++ b/integration-tests/Dockerfile_centos7.md5 @@ -1 +1 @@ -1f7064dbc55b5c3e1fbb23f2e6457a13 Dockerfile_centos7 +c23a345162d68af38d754ebc7233be35 Dockerfile_centos7 diff --git a/integration-tests/Dockerfile_trusty b/integration-tests/Dockerfile_trusty index 04e0f8235..74ce18d4f 100644 --- a/integration-tests/Dockerfile_trusty +++ b/integration-tests/Dockerfile_trusty @@ -1,5 +1,5 @@ FROM ubuntu-upstart:trusty -MAINTAINER Ahmed +LABEL org.opencontainers.image.authors="Ahmed" RUN apt-get update && \ apt-get install -y apache2=2.4.7-1ubuntu4.22 tinyproxy && \ diff --git a/integration-tests/Dockerfile_trusty.md5 b/integration-tests/Dockerfile_trusty.md5 index 5a2c288f6..2b9604b10 100644 --- a/integration-tests/Dockerfile_trusty.md5 +++ b/integration-tests/Dockerfile_trusty.md5 @@ -1 +1 @@ -ac8c8df3415c0eecdbedc322480e696e Dockerfile_trusty +b7ef9dc0d9c6b00f6997fb25e3a19451 Dockerfile_trusty diff --git a/integration-tests/Dockerfile_wheezy b/integration-tests/Dockerfile_wheezy index 9992d09b9..9c83d08c3 100644 --- a/integration-tests/Dockerfile_wheezy +++ b/integration-tests/Dockerfile_wheezy @@ -1,5 +1,5 @@ FROM debian:wheezy -MAINTAINER Ahmed +LABEL org.opencontainers.image.authors="Ahmed" RUN echo 'deb http://archive.debian.org/debian wheezy main' > /etc/apt/sources.list RUN echo 'deb http://archive.debian.org/debian-security wheezy/updates main' >> /etc/apt/sources.list diff --git a/integration-tests/Dockerfile_wheezy.md5 b/integration-tests/Dockerfile_wheezy.md5 index 0121d5cf2..5af447a73 100644 --- a/integration-tests/Dockerfile_wheezy.md5 +++ b/integration-tests/Dockerfile_wheezy.md5 @@ -1 +1 @@ -485a260105b0f1da058fa4af863e2ecc Dockerfile_wheezy +da725462c09b35ccf7759080ed5e8059 Dockerfile_wheezy From 2423e0b68de57e63cfff793bbba5f7fad91b8e62 Mon Sep 17 00:00:00 2001 From: dklimpel <5740567+dklimpel@users.noreply.github.com> Date: Sat, 13 Jul 2024 18:27:28 +0200 Subject: [PATCH 2/2] fix md5sums --- integration-tests/Dockerfile_centos7.md5 | 2 +- integration-tests/Dockerfile_trusty.md5 | 2 +- integration-tests/Dockerfile_wheezy.md5 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/Dockerfile_centos7.md5 b/integration-tests/Dockerfile_centos7.md5 index 4f4be222c..f158ee573 100644 --- a/integration-tests/Dockerfile_centos7.md5 +++ b/integration-tests/Dockerfile_centos7.md5 @@ -1 +1 @@ -c23a345162d68af38d754ebc7233be35 Dockerfile_centos7 +148b069bc0a023068cbcdfe8b24fe036 Dockerfile_centos7 diff --git a/integration-tests/Dockerfile_trusty.md5 b/integration-tests/Dockerfile_trusty.md5 index 2b9604b10..73eb85c15 100644 --- a/integration-tests/Dockerfile_trusty.md5 +++ b/integration-tests/Dockerfile_trusty.md5 @@ -1 +1 @@ -b7ef9dc0d9c6b00f6997fb25e3a19451 Dockerfile_trusty +9db0e607ec52f1fd1290785721733180 Dockerfile_trusty diff --git a/integration-tests/Dockerfile_wheezy.md5 b/integration-tests/Dockerfile_wheezy.md5 index 5af447a73..84e9e5dd6 100644 --- a/integration-tests/Dockerfile_wheezy.md5 +++ b/integration-tests/Dockerfile_wheezy.md5 @@ -1 +1 @@ -da725462c09b35ccf7759080ed5e8059 Dockerfile_wheezy +557a19e04e66f0a9afb6035952b5ca18 Dockerfile_wheezy