Merge remote-tracking branch 'origin/master' into build_tag_ci

goss-org · Jul 13, 2024 · 75829b5 · 75829b5
2 parents 1b2ac63 + db068fe
commit 75829b5
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/development/build_images.sh b/development/build_images.sh
@@ -5,9 +5,21 @@ set -xeu
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 INTEGRATION_TEST_DIR="$SCRIPT_DIR/../integration-tests/"
 
+LABEL_DATE=$(date -u +'%Y-%m-%dT%H:%M:%S.%3NZ')
+LABEL_URL="https://github.com/goss-org/goss"
+LABEL_REVISION=$(git rev-parse HEAD)
 
 for docker_file in $INTEGRATION_TEST_DIR/Dockerfile_*; do
     [[ $docker_file == *.md5 ]] && continue
     os=$(cut -d '_' -f2 <<<"$docker_file")
-    docker build -t "aelsabbahy/goss_${os}:latest" - < "$docker_file"
+    docker build \
+        --label "org.opencontainers.image.created=$LABEL_DATE" \
+        --label "org.opencontainers.image.description=Quick and Easy server testing/validation" \
+        --label "org.opencontainers.image.licenses=Apache-2.0" \
+        --label "org.opencontainers.image.revision=$LABEL_REVISION" \
+        --label "org.opencontainers.image.source=$LABEL_URL" \
+        --label "org.opencontainers.image.title=goss" \
+        --label "org.opencontainers.image.url=$LABEL_URL" \
+        --label "org.opencontainers.image.version=manual" \
+        -t "aelsabbahy/goss_${os}:latest" - < "$docker_file"
 done
diff --git 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
@@ -1 +1 @@
-f9c8c187e94693c4625a8c8d01fae3bf  Dockerfile_alpine3
+3c4e7fbf89cd2edfeae94728e247213d  Dockerfile_alpine3
diff --git 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
@@ -1 +1 @@
-1f7064dbc55b5c3e1fbb23f2e6457a13  Dockerfile_centos7
+148b069bc0a023068cbcdfe8b24fe036  Dockerfile_centos7
diff --git 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
@@ -1 +1 @@
-ac8c8df3415c0eecdbedc322480e696e  Dockerfile_trusty
+9db0e607ec52f1fd1290785721733180  Dockerfile_trusty
diff --git 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
@@ -1 +1 @@
-485a260105b0f1da058fa4af863e2ecc  Dockerfile_wheezy
+557a19e04e66f0a9afb6035952b5ca18  Dockerfile_wheezy