Merge pull request #539 from jackgr/deployment

Fix merge error
10 years ago · f4f28dd1be
parent f9fd2db673 c8b8720374
commit f4f28dd1be
2 changed files with 0 additions and 2 deletions
--- 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
--- 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