From 4b9b8295c55e4d5e8684549e4e68f62d949734c1 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 16 Sep 2016 10:58:54 +0100 Subject: [PATCH] Explicitly set the apk repositories we use Previously we used the defaults (main and community) but we currently only need main, but are likely to need some packages from edge soon. Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/alpine-base/Dockerfile | 2 ++ alpine/base/alpine-base/Makefile | 2 +- alpine/base/alpine-base/repositories | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 alpine/base/alpine-base/repositories diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f17366632..cf568a39e 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:5ee3744f0fbcdd3e9c6216322e1d023e4cdf9ee4 +FROM mobylinux/alpine-base:be37f68d6da073bab6b0d82ff3669ee0ae41aac8 ENV ARCH=x86_64 diff --git a/alpine/base/alpine-base/Dockerfile b/alpine/base/alpine-base/Dockerfile index ba0a16479..64c3715c2 100644 --- a/alpine/base/alpine-base/Dockerfile +++ b/alpine/base/alpine-base/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.4 +COPY repositories /etc/apk/ + RUN \ apk update && apk upgrade && \ apk add \ diff --git a/alpine/base/alpine-base/Makefile b/alpine/base/alpine-base/Makefile index 28a7a67e9..6f2a57953 100644 --- a/alpine/base/alpine-base/Makefile +++ b/alpine/base/alpine-base/Makefile @@ -7,7 +7,7 @@ default: push hash: docker pull $(BASE) - tar cf - Dockerfile | docker build --no-cache -t $(IMAGE):build - + tar cf - Dockerfile repositories | docker build --no-cache -t $(IMAGE):build - docker run --rm $(IMAGE):build sha1sum /lib/apk/db/installed | sed 's/ .*//' > hash push: hash diff --git a/alpine/base/alpine-base/repositories b/alpine/base/alpine-base/repositories new file mode 100644 index 000000000..c20c1a9fc --- /dev/null +++ b/alpine/base/alpine-base/repositories @@ -0,0 +1 @@ +http://dl-cdn.alpinelinux.org/alpine/v3.4/main