github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-03 07:55:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #791 from justincormack/alpinefix

Browse Source 
Make sure we do apk upgrade -a
This commit is contained in:
Justin Cormack 2016-11-24 13:13:55 -08:00 committed by GitHub
commit 74db55253f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-base:1f8cbdcb727dbbc5fb7ca7f124aff7abbd3b57d0 FROM mobylinux/alpine-base:0a817292cda32c2d7fb9b07abbab7c2ba09833a2
ENV ARCH=x86_64 ENV ARCH=x86_64

4
alpine/base/alpine-base/Dockerfile
View File

@ -1,9 +1,9 @@
FROM alpine:edge FROM alpine:3.4
COPY repositories /etc/apk/ COPY repositories /etc/apk/
RUN \ RUN \
apk update && apk upgrade && \ apk update && apk upgrade -a && \
apk add --no-cache \ apk add --no-cache \
busybox-initscripts \ busybox-initscripts \
chrony \ chrony \

2
alpine/base/alpine-base/Makefile
View File

@ -1,6 +1,6 @@
.PHONY: tag push .PHONY: tag push
BASE=alpine:edge BASE=alpine:3.4
IMAGE=alpine-base IMAGE=alpine-base
default: push default: push