Use debian only for base image (#517)

Install ca-certificates using apt instead of copying from another base image to not have to download multiple base images.
getporter · Aug 14, 2019 · f095b38 · f095b38
1 parent fb4fa4c
commit f095b38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/porter/build_test.go b/pkg/porter/build_test.go
@@ -30,12 +30,12 @@ func TestPorter_buildDockerfile(t *testing.T) {
 	require.NoError(t, err)
 
 	wantlines := []string{
-		"FROM quay.io/deis/lightweight-docker-go:v0.2.0",
 		"FROM debian:stretch",
-		"COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt",
 		"",
 		"ARG BUNDLE_DIR",
 		"",
+		"RUN apt-get update && apt-get install -y ca-certificates",
+		"",
 		"COPY .cnab /cnab",
 		"COPY . $BUNDLE_DIR",
 		"RUN rm -fr $BUNDLE_DIR/.cnab",
@@ -99,12 +99,12 @@ func TestPorter_buildDockerfile_output(t *testing.T) {
 
 	wantlines := `
 Generating Dockerfile =======>
-FROM quay.io/deis/lightweight-docker-go:v0.2.0
 FROM debian:stretch
-COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 ARG BUNDLE_DIR
 
+RUN apt-get update && apt-get install -y ca-certificates
+
 COPY .cnab /cnab
 COPY . $BUNDLE_DIR
 RUN rm -fr $BUNDLE_DIR/.cnab

diff --git a/pkg/porter/templates/build/Dockerfile b/pkg/porter/templates/build/Dockerfile
@@ -1,9 +1,9 @@
-FROM quay.io/deis/lightweight-docker-go:v0.2.0
 FROM debian:stretch
-COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 
 ARG BUNDLE_DIR
 
+RUN apt-get update && apt-get install -y ca-certificates
+
 COPY .cnab /cnab
 COPY . $BUNDLE_DIR
 RUN rm -fr $BUNDLE_DIR/.cnab