Merge pull request #1050 from aledbf/update-uslim

Release ubuntu-slim 0.14
kubernetes · Aug 7, 2017 · 15a888b · 15a888b
2 parents a3ca02e + d758f79
commit 15a888b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/images/ubuntu-slim/Dockerfile.build b/images/ubuntu-slim/Dockerfile.build
@@ -29,7 +29,8 @@ RUN echo "Yes, do as I say!" | apt-get purge \
     ncurses-bin \
     locales \
     tzdata \
-    systemd
+    systemd \
+    libsystemd0
 
 # cleanup
 RUN apt-get autoremove -y && \

diff --git a/images/ubuntu-slim/Makefile b/images/ubuntu-slim/Makefile
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG ?= 0.13
+TAG ?= 0.14
 REGISTRY = gcr.io/google_containers
 ARCH ?= $(shell go env GOARCH)
-ALL_ARCH = amd64 arm arm64 ppc64le
+ALL_ARCH = amd64 arm arm64 ppc64le s390x
 
-QEMUVERSION=v2.7.0
+QEMUVERSION=v2.9.1
 
 IMGNAME = ubuntu-slim
 IMAGE = $(REGISTRY)/$(IMGNAME)
@@ -44,10 +44,10 @@ ifeq ($(ARCH),ppc64le)
 	QEMUARCH=ppc64le
 endif
 
-#ifeq ($(ARCH),s390x)
-#	BASEIMAGE?=s390x/ubuntu:16.04
-#	QEMUARCH=s390x
-#endif
+ifeq ($(ARCH),s390x)
+	BASEIMAGE?=s390x/ubuntu:16.04
+	QEMUARCH=s390x
+endif
 
 
 TEMP_DIR := $(shell mktemp -d)