From 35c0bfe529adadb2b3620d74ea08149a3b828d5f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 24 Nov 2016 21:07:00 +0000 Subject: [PATCH] Make sure we do apk upgrade -a Also base off 3.4 for consistency. Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/alpine-base/Dockerfile | 4 ++-- alpine/base/alpine-base/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index d4ea4e1c2..ae161445c 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:1f8cbdcb727dbbc5fb7ca7f124aff7abbd3b57d0 +FROM mobylinux/alpine-base:0a817292cda32c2d7fb9b07abbab7c2ba09833a2 ENV ARCH=x86_64 diff --git a/alpine/base/alpine-base/Dockerfile b/alpine/base/alpine-base/Dockerfile index 634fa8510..33482a073 100644 --- a/alpine/base/alpine-base/Dockerfile +++ b/alpine/base/alpine-base/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:edge +FROM alpine:3.4 COPY repositories /etc/apk/ RUN \ - apk update && apk upgrade && \ + apk update && apk upgrade -a && \ apk add --no-cache \ busybox-initscripts \ chrony \ diff --git a/alpine/base/alpine-base/Makefile b/alpine/base/alpine-base/Makefile index b21f46fa1..316b04821 100644 --- a/alpine/base/alpine-base/Makefile +++ b/alpine/base/alpine-base/Makefile @@ -1,6 +1,6 @@ .PHONY: tag push -BASE=alpine:edge +BASE=alpine:3.4 IMAGE=alpine-base default: push