From 770f69345994900e1e8a442531593faf997d6292 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Wed, 6 Nov 2019 10:06:52 +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 cc8094a19..e7b965efa 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 WebDAV" \ + org.label-schema.name="oCIS WebDAV" \ 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 171651720..db70c6f4f 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 WebDAV" \ + org.label-schema.name="oCIS WebDAV" \ 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 3e4479cc0..4a9f706b7 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 WebDAV" \ + org.label-schema.name="oCIS WebDAV" \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0"