Skip to content

Commit 31de4a6

Browse files
committed
add dependency
1 parent 3f41ce9 commit 31de4a6

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

kubernetes/linux/Dockerfile.multiarch

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,10 @@ LABEL vendor=Microsoft\ Corp \
1919
com.microsoft.product="Azure Monitor for containers"
2020
ENV tmpdir /opt
2121

22-
COPY kubernetes/linux/azurelinux-official-cloud-native-arm64.repo /tmp/azurelinux-official-cloud-native-arm64.repo
23-
COPY kubernetes/linux/azurelinux-official-cloud-native-amd64.repo /tmp/azurelinux-official-cloud-native-amd64.repo
24-
RUN if [ "${TARGETARCH}" == "arm64" ]; then \
25-
cp /tmp/azurelinux-official-cloud-native-arm64.repo /etc/yum.repos.d/; \
26-
else \
27-
cp /tmp/azurelinux-official-cloud-native-amd64.repo /etc/yum.repos.d/; \
28-
fi
29-
30-
RUN tdnf clean all && \
31-
tdnf repolist --refresh && \
32-
tdnf -y update && \
33-
tdnf install -y ca-certificates-microsoft && \
34-
update-ca-trust && \
35-
tdnf install -y \
22+
RUN tdnf clean all
23+
RUN tdnf repolist --refresh
24+
RUN tdnf -y update
25+
RUN tdnf install -y \
3626
build-essential \
3727
wget \
3828
curl \
@@ -57,6 +47,14 @@ RUN mkdir /busybin && busybox --install /busybin
5747
COPY --from=golang-builder /src/kubernetes/linux/Linux_ULINUX_1.0_*_64_Release/docker-cimprov-*.*.*-*.*.sh $tmpdir/
5848
COPY kubernetes/linux/setup.sh kubernetes/linux/main.sh kubernetes/linux/defaultpromenvvariables kubernetes/linux/defaultpromenvvariables-rs kubernetes/linux/defaultpromenvvariables-sidecar kubernetes/linux/mdsd.xml kubernetes/linux/envmdsd kubernetes/linux/logrotate.conf $tmpdir/
5949

50+
COPY kubernetes/linux/azurelinux-official-cloud-native-arm64.repo /tmp/azurelinux-official-cloud-native-arm64.repo
51+
COPY kubernetes/linux/azurelinux-official-cloud-native-amd64.repo /tmp/azurelinux-official-cloud-native-amd64.repo
52+
RUN if [ "${TARGETARCH}" == "arm64" ]; then \
53+
cp /tmp/azurelinux-official-cloud-native-arm64.repo /etc/yum.repos.d/; \
54+
else \
55+
cp /tmp/azurelinux-official-cloud-native-amd64.repo /etc/yum.repos.d/; \
56+
fi
57+
6058
WORKDIR ${tmpdir}
6159

6260
RUN chmod 775 $tmpdir/*.sh; sync; $tmpdir/setup.sh ${TARGETARCH}

0 commit comments

Comments
 (0)