Skip to content

Commit befd480

Browse files
committed
Update Dockerfiles for stretch -> buster change
1 parent 4e2852a commit befd480

File tree

2 files changed

+29
-9
lines changed

2 files changed

+29
-9
lines changed

Dockerfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@ FROM gcr.io/google_containers/hyperkube:v1.18.4
22
RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
33
apt-get update && apt-get upgrade -y && apt-get clean && \
44
clean-install apt-transport-https gnupg1 curl zfsutils-linux \
5-
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ stretch main" > \
5+
&& echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \
66
/etc/apt/sources.list.d/azure-cli.list \
77
&& curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
88
&& apt-get purge gnupg \
99
&& clean-install \
1010
xfsprogs \
1111
open-iscsi \
12-
azure-cli
12+
azure-cli \
13+
iproute2 \
14+
iputils-ping \
15+
procps \
16+
glusterfs-client \
17+
glusterfs-common \
18+
samba-common \
19+
arptables
1320

14-
RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \
15-
/etc/apt/sources.list.d/backports.list \
16-
&& clean-install -t stretch-backports glusterfs-client glusterfs-common
21+
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
22+
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \
23+
update-alternatives --set arptables /usr/sbin/arptables-legacy && \
24+
update-alternatives --set ebtables /usr/sbin/ebtables-legacy

Dockerfile.arm64

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,23 @@ FROM gcr.io/google_containers/hyperkube:v1.18.4
22
RUN sed -i -e 's!\bmain\b!main contrib!g' /etc/apt/sources.list && \
33
apt-get update && apt-get upgrade -y && apt-get clean && \
44
clean-install apt-transport-https gnupg1 curl zfsutils-linux \
5+
&& echo "deb [arch=arm64] https://packages.microsoft.com/repos/azure-cli/ buster main" > \
6+
/etc/apt/sources.list.d/azure-cli.list \
7+
&& curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
58
&& apt-get purge gnupg \
69
&& clean-install \
710
xfsprogs \
8-
open-iscsi
11+
open-iscsi \
12+
azure-cli \
13+
iproute2 \
14+
iputils-ping \
15+
procps \
16+
glusterfs-client \
17+
glusterfs-common \
18+
samba-common \
19+
arptables
920

10-
RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> \
11-
/etc/apt/sources.list.d/backports.list \
12-
&& clean-install -t stretch-backports glusterfs-client glusterfs-common
21+
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy && \
22+
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy && \
23+
update-alternatives --set arptables /usr/sbin/arptables-legacy && \
24+
update-alternatives --set ebtables /usr/sbin/ebtables-legacy

0 commit comments

Comments
 (0)