From e0d7f821355762bdd03f0d03c7a55e490e7a2270 Mon Sep 17 00:00:00 2001
From: buanet <info@buanet.de>
Date: Sat, 28 Aug 2021 14:58:21 +0200
Subject: [PATCH] actions test

---
 .github/dependabot.yml                       |  8 ++++++++
 .github/workflows/docker_build_dev_image.yml |  6 +++---
 amd64/Dockerfile                             |  8 ++++++--
 arm32v7/Dockerfile                           | 13 ++++++-------
 arm64v8/Dockerfile                           |  9 +++++++--
 manifest.yml                                 |  8 ++++----
 6 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..da0ed1b6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "dev"
diff --git a/.github/workflows/docker_build_dev_image.yml b/.github/workflows/docker_build_dev_image.yml
index a5ba9d93..440c4f68 100644
--- a/.github/workflows/docker_build_dev_image.yml
+++ b/.github/workflows/docker_build_dev_image.yml
@@ -30,11 +30,11 @@ jobs:
           echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV
           echo "This is the Buildnumber/Timestamp: $DATI"
           echo "dati=$DATI" >> $GITHUB_ENV
-          sed -e "s/\${VERSION}/$VERSION-devbuild/" -e "s/\${DATI}/$DATI/" ./amd64/Dockerfile > ./amd64/Dockerfile.tmp
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./amd64/Dockerfile > ./amd64/Dockerfile.tmp
           mv -f ./amd64/Dockerfile.tmp ./amd64/Dockerfile
-          sed -e "s/\${VERSION}/$VERSION-devbuild/" -e "s/\${DATI}/$DATI/" ./arm32v7/Dockerfile > ./arm32v7/Dockerfile.tmp
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./arm32v7/Dockerfile > ./arm32v7/Dockerfile.tmp
           mv -f ./arm32v7/Dockerfile.tmp ./arm32v7/Dockerfile
-          sed -e "s/\${VERSION}/$VERSION-devbuild/" -e "s/\${DATI}/$DATI/" ./arm64v8/Dockerfile > ./arm64v8/Dockerfile.tmp
+          sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./arm64v8/Dockerfile > ./arm64v8/Dockerfile.tmp
           mv -f ./arm64v8/Dockerfile.tmp ./arm64v8/Dockerfile
 
       - name: Set up manifest tool
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index b821850c..fc49f7ef 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -1,7 +1,11 @@
 FROM amd64/debian:buster
 
-LABEL maintainer="Andre Germann" \
-      url="https://buanet.de"
+LABEL org.opencontainers.image.title="ioBroker Docker Image" \
+      org.opencontainers.image.description="Docker image for ioBroker smarthome software" \
+      org.opencontainers.image.authors="info@buanet.de" \
+      org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${DATI}"
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/arm32v7/Dockerfile b/arm32v7/Dockerfile
index 676fa573..e082af98 100644
--- a/arm32v7/Dockerfile
+++ b/arm32v7/Dockerfile
@@ -1,15 +1,14 @@
 FROM balenalib/armv7hf-debian:buster
 
-LABEL maintainer="Andre Germann" \
-      url="https://buanet.de"
+LABEL org.opencontainers.image.title="ioBroker Docker Image" \
+      org.opencontainers.image.description="Docker image for ioBroker smarthome software" \
+      org.opencontainers.image.authors="info@buanet.de" \
+      org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${DATI}"
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Workaround for building image with buildx
-#RUN ln -s /usr/bin/dpkg-split /usr/sbin/dpkg-split && \
-#    ln -s /usr/bin/dpkg-deb /usr/sbin/dpkg-deb && \
-#    ln -s /bin/tar /usr/sbin/tar
-
 # Install prerequisites (as listed in iobroker installer.sh)
 RUN apt-get update && apt-get install -y \
     acl \
diff --git a/arm64v8/Dockerfile b/arm64v8/Dockerfile
index fbe6c1cf..6e23a59c 100644
--- a/arm64v8/Dockerfile
+++ b/arm64v8/Dockerfile
@@ -1,7 +1,12 @@
 FROM balenalib/aarch64-debian:buster
 
-LABEL maintainer="Andre Germann" \
-      url="https://buanet.de"
+LABEL org.opencontainers.image.title="ioBroker Docker Image" \
+      org.opencontainers.image.description="Docker image for ioBroker smarthome software" \
+      org.opencontainers.image.authors="info@buanet.de" \
+      org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${DATI}"
+
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/manifest.yml b/manifest.yml
index eec7aa38..5c2a7997 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,18 +1,18 @@
-image: buanet/iobroker:$DOCKERTAG
+image: buanet/iobroker:${DOCKERTAG}
 manifests:
   -
-    image: buanet/iobroker:$VERSION-amd64
+    image: buanet/iobroker:${VERSION}-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: buanet/iobroker:$VERSION-arm64v8
+    image: buanet/iobroker:${VERSION}-arm64v8
     platform:
       architecture: arm64
       variant: v8
       os: linux
   -
-    image: buanet/iobroker:$VERSION-arm32v7
+    image: buanet/iobroker:${VERSION}-arm32v7
     platform:
       architecture: arm
       variant: v7