From c8b8720374f93816ebdf1a12f4bacb23c73b3ecc Mon Sep 17 00:00:00 2001 From: jackgr Date: Thu, 31 Mar 2016 12:17:58 -0700 Subject: [PATCH] Fix merge error --- rootfs/manager/Dockerfile | 1 - rootfs/resourcifier/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/rootfs/manager/Dockerfile b/rootfs/manager/Dockerfile index 600d5b8a5..a33e4f912 100644 --- a/rootfs/manager/Dockerfile +++ b/rootfs/manager/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM alpine:3.3 -RUN apk --update add ca-certificates COPY . / # Install CA certs diff --git a/rootfs/resourcifier/Dockerfile b/rootfs/resourcifier/Dockerfile index 1757e0fbc..e9ffb8ec7 100644 --- a/rootfs/resourcifier/Dockerfile +++ b/rootfs/resourcifier/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM alpine:3.3 -RUN apk --update add ca-certificates COPY . / # Install CA certs