aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortcely <tcely@users.noreply.github.com>2019-05-11 16:29:48 -0400
committerGitHub <noreply@github.com>2019-05-11 16:29:48 -0400
commit0592987999ea7473852663708c4bbb0d09056599 (patch)
tree297863a614401957c97d12f81e7aaa9f409bee9e
parentc5508e242ebc64e0c5018ac115c3dff8d3ae77ba (diff)
downloaddocker-abuild-0592987999ea7473852663708c4bbb0d09056599.tar.bz2
docker-abuild-0592987999ea7473852663708c4bbb0d09056599.tar.xz
Dockefile: /etc/apk/repositories
- only pull testing from edge - correct edge tag first, once per line - remove tag from locally built repos
-rw-r--r--Dockerfile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/Dockerfile.in b/Dockerfile.in
index 1a22903..39c67cb 100644
--- a/Dockerfile.in
+++ b/Dockerfile.in
@@ -1,12 +1,14 @@
FROM alpine:%%ALPINE_TAG%%
MAINTAINER Richard Mortier <mort@cantab.net>
-RUN rm /etc/apk/repositories \
- && printf -- 'http://dl-cdn.alpinelinux.org/alpine/v%%ALPINE_TAG%%/%s\n' \
- main community testing >> /etc/apk/repositories \
- && printf -- '/home/builder/packages/%%ALPINE_TAG%%/%s\n' \
- main community testing >> /etc/apk/repositories \
- && sed -i 's!vedge!edge!g' /etc/apk/repositories
+RUN rm /etc/apk/repositories && \
+ printf -- >> /etc/apk/repositories \
+ 'http://dl-cdn.alpinelinux.org/alpine/v%%ALPINE_TAG%%/%s\n' \
+ main community $(test edge = "%%ALPINE_TAG%%" && echo testing) && \
+ sed -i -e 's!/vedge/!/edge/!' /etc/apk/repositories && \
+ printf -- >> /etc/apk/repositories \
+ '/home/builder/packages/%s\n' \
+ main community testing
RUN apk add --update-cache \
alpine-conf \