Merge pull request #1365 from skriss/update-base-images

switch to debian:stretch-slim base images and go 1.12.x

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.11.x
+  - 1.12.x
 
 sudo: required
 

Dockerfile-fsfreeze-pause

@@ -1,4 +1,4 @@
-# Copyright 2018 the Velero contributors.
+# Copyright 2018, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,11 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.8
+FROM debian:stretch-slim
 
-MAINTAINER Wayne Witzel III <wayne@heptio.com>
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"
 
-RUN apk add --no-cache ca-certificates
-RUN apk add --update --no-cache busybox util-linux
-
-ENTRYPOINT ["/bin/sh", "-c", "while true; do sleep 10000; done"]
+ENTRYPOINT ["/bin/bash", "-c", "while true; do sleep 10000; done"]

Dockerfile-velero

@@ -1,4 +1,4 @@
-# Copyright 2017 the Velero contributors.
+# Copyright 2017, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,17 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.8
+FROM debian:stretch-slim
 
-MAINTAINER Andy Goldstein <andy@heptio.com>
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"
 
-RUN apk add --no-cache ca-certificates
-
-RUN apk add --update --no-cache bzip2 && \
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates wget bzip2 && \
     wget --quiet https://github.com/restic/restic/releases/download/v0.9.4/restic_0.9.4_linux_amd64.bz2 && \
     bunzip2 restic_0.9.4_linux_amd64.bz2 && \
     mv restic_0.9.4_linux_amd64 /usr/bin/restic && \
-    chmod +x /usr/bin/restic
+    chmod +x /usr/bin/restic && \
+    apt-get remove -y wget bzip2 && \
+    rm -rf /var/lib/apt/lists/*
+
 
 ADD /bin/linux/amd64/velero /velero
 

Dockerfile-velero-restic-restore-helper

@@ -1,4 +1,4 @@
-# Copyright 2018 the Velero contributors.
+# Copyright 2018, 2019 the Velero contributors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.8
+FROM debian:stretch-slim
 
-MAINTAINER Steve Kriss <steve@heptio.com>
+LABEL maintainer="Steve Kriss <krisss@vmware.com>"
 
 ADD /bin/linux/amd64/velero-restic-restore-helper .
 

Makefile

@@ -47,7 +47,7 @@ GOARCH = $(word 2, $(platform_temp))
 # TODO(ncdc): support multiple image architectures once gcr.io supports manifest lists
 # Set default base image dynamically for each arch
 ifeq ($(GOARCH),amd64)
-		DOCKERFILE ?= Dockerfile-$(BIN).alpine
+		DOCKERFILE ?= Dockerfile-$(BIN)
 endif
 #ifeq ($(GOARCH),arm)
 #		DOCKERFILE ?= Dockerfile.arm #armel/busybox

changelogs/unreleased/1365-skriss

@@ -0,0 +1 @@
+change container base images to debian:stretch-slim and upgrade to go 1.12

hack/build-image/Dockerfile

@@ -12,10 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.11-alpine3.8
+FROM golang:1.12-stretch
 
-RUN apk add --update --no-cache git bash && \
-    mkdir -p /go/src/k8s.io && \
+RUN mkdir -p /go/src/k8s.io && \
     cd /go/src/k8s.io && \
     git config --global advice.detachedHead false && \
     git clone -b kubernetes-1.12.0 https://github.com/kubernetes/code-generator && \