Skip to content

Commit 3799606

Browse files
Andrew KerrAndrew Kerr
authored andcommitted
Upgrade to alpine 3.6
(cherry picked from commit 0aae2ef)
1 parent abd709f commit 3799606

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

contrib/docker/plugin/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.6
2+
3+
# Use APK mirrors for fault tolerance
4+
RUN printf "http://dl-1.alpinelinux.org/alpine/v3.6/main\nhttp://dl-2.alpinelinux.org/alpine/v3.6/main\nhttp://dl-3.alpinelinux.org/alpine/v3.6/main\nhttp://dl-4.alpinelinux.org/alpine/v3.6/main\nhttp://dl-5.alpinelinux.org/alpine/v3.6/main\n\nhttp://dl-1.alpinelinux.org/alpine/v3.6/community\nhttp://dl-2.alpinelinux.org/alpine/v3.6/community\nhttp://dl-3.alpinelinux.org/alpine/v3.6/community\nhttp://dl-4.alpinelinux.org/alpine/v3.6/community\nhttp://dl-5.alpinelinux.org/alpine/v3.6/community" > /etc/apk/repositories
25

36
RUN apk update && \
47
apk add coreutils nfs-utils util-linux blkid multipath-tools lsscsi e2fsprogs xfsprogs bash

contrib/rancher/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.4
1+
FROM alpine:3.6
22

33
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
44
RUN mkdir -p /netapp /etc/netappdvp
@@ -20,6 +20,9 @@ RUN ln -s /host/var/log /var/log
2020
RUN mkdir -p /host/var/lib/docker-volumes
2121
RUN ln -s /host/var/lib/docker-volumes /var/lib/docker-volumes
2222

23+
# Use APK mirrors for fault tolerance
24+
RUN printf "http://dl-1.alpinelinux.org/alpine/v3.6/main\nhttp://dl-2.alpinelinux.org/alpine/v3.6/main\nhttp://dl-3.alpinelinux.org/alpine/v3.6/main\nhttp://dl-4.alpinelinux.org/alpine/v3.6/main\nhttp://dl-5.alpinelinux.org/alpine/v3.6/main\n\nhttp://dl-1.alpinelinux.org/alpine/v3.6/community\nhttp://dl-2.alpinelinux.org/alpine/v3.6/community\nhttp://dl-3.alpinelinux.org/alpine/v3.6/community\nhttp://dl-4.alpinelinux.org/alpine/v3.6/community\nhttp://dl-5.alpinelinux.org/alpine/v3.6/community" > /etc/apk/repositories
25+
2326
RUN apk update && apk add curl vim screen tmux bash jq
2427

2528
#ADD netappdvp-1.3.tar.gz /netapp

0 commit comments

Comments
 (0)