From 4ec0f5ce4115ad68f7cba8f254e0332147946e9d Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Wed, 6 Nov 2019 10:07:10 +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 6c38edda65..9d548fc434 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 Hyper" \ + org.label-schema.name="oCIS" \ 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 46b9988db5..8cc00ae6ec 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 Hyper" \ + org.label-schema.name="oCIS" \ 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 925a919311..1a920d58da 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 Hyper" \ + org.label-schema.name="oCIS" \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0"