From d3fb71643f9e273fcb899f4b7ae853403172c9d4 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Wed, 6 Nov 2019 10:06:47 +0100 Subject: [PATCH] Fix docker labels, use better base images --- docker/Dockerfile.linux.amd64 | 7 ++++--- docker/Dockerfile.linux.arm | 5 +++-- docker/Dockerfile.linux.arm64 | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64 index a301421f8..f8e6163e7 100644 --- a/docker/Dockerfile.linux.amd64 +++ b/docker/Dockerfile.linux.amd64 @@ -1,12 +1,13 @@ -FROM alpine:edge +FROM amd64/alpine:edge RUN apk update && \ apk upgrade && \ apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* + rm -rf /var/cache/apk/* && \ + echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="Reva OCS" \ + org.label-schema.name="oCIS OCS" \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm index 7c138c14c..6b9f02390 100644 --- a/docker/Dockerfile.linux.arm +++ b/docker/Dockerfile.linux.arm @@ -3,10 +3,11 @@ FROM arm32v6/alpine:edge RUN apk update && \ apk upgrade && \ apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* + rm -rf /var/cache/apk/* && \ + echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="Reva OCS" \ + org.label-schema.name="oCIS OCS" \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64 index df642fe8b..7663c0e37 100644 --- a/docker/Dockerfile.linux.arm64 +++ b/docker/Dockerfile.linux.arm64 @@ -3,10 +3,11 @@ FROM arm64v8/alpine:edge RUN apk update && \ apk upgrade && \ apk add ca-certificates mailcap && \ - rm -rf /var/cache/apk/* + rm -rf /var/cache/apk/* && \ + echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="ownCloud GmbH " \ - org.label-schema.name="Reva OCS" \ + org.label-schema.name="oCIS OCS" \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0"