Skip to content

Commit 9243f58

Browse files
committed
removing comments
1 parent b45c31a commit 9243f58

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.pipelines/azure_pipeline_mergedbranches.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ trigger:
88
branches:
99
include:
1010
- ci_prod
11-
- ngotina/azureLinux3.0Upgrade
1211

1312
pr:
1413
branches:

kubernetes/linux/Dockerfile.multiarch

+8-13
Original file line numberDiff line numberDiff line change
@@ -105,28 +105,23 @@ COPY --from=builder /usr/bin/trust /usr/bin/trust
105105
COPY --from=builder /usr/share/pki/ca-trust-source /usr/share/pki/ca-trust-source
106106
COPY --from=builder /usr/share/p11-kit/ /usr/share/p11-kit/
107107

108-
# bash dependencies (note: done)
108+
# bash dependencies
109109
COPY --from=builder /usr/lib/libreadline.so.8 /usr/lib/libc.so.6 /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6 /usr/lib/
110-
# inotifywait dependencies (note: done)
110+
# inotifywait dependencies
111111
COPY --from=builder /usr/lib/libinotifytools.so.0 /usr/lib/libstdc++.so.6 /usr/lib/libgcc_s.so.1 /usr/lib/libc.so.6 /usr/lib/libm.so.6 /usr/lib/
112-
# crond dependencies (note: done)
113-
# COPY --from=builder /lib/libpcre.so.1 /lib/libaudit.so.1 /lib/libcap-ng.so.0 /lib/
112+
# crond dependencies
114113
COPY --from=builder /usr/lib/libselinux.so.1 /usr/lib/libpam.so.0 /usr/lib/libc.so.6 /usr/lib/
115-
# ruby dependencies (note: done)
114+
# ruby dependencies
116115
COPY --from=builder /usr/lib/libruby.so.3.1 /usr/lib/libz.so.1 /usr/lib/libgmp.so.10 /usr/lib/libcrypt.so.1 /usr/lib/libm.so.6 /usr/lib/libc.so.6 /usr/lib/
117116
# fluent-bit dependencies (note: done; might remove libssl.so.3 and libcrypto.so.3)
118-
# libssl.so.1.1 & libcrypto.so.1.1 are already available with openssl in distroless and copying them over causes FIPS HMAC verification failures
117+
# libssl.so.3 & libcrypto.so.3 are already available with openssl in distroless and copying them over causes FIPS HMAC verification failures
119118
COPY --from=builder /usr/lib/libluajit-5.1.so.2 /usr/lib/libyaml-0.so.2 /usr/lib/libsystemd.so.0 /usr/lib/libcurl.so.4 /usr/lib/libz.so.1 /usr/lib/libzstd.so.1 /usr/lib/libsasl2.so.3 /usr/lib/libm.so.6 /usr/lib/libgcc_s.so.1 /usr/lib/libc.so.6 /usr/lib/libcap.so.2 /usr/lib/liblz4.so.1 /usr/lib/liblzma.so.5 /usr/lib/libnghttp2.so.14 /usr/lib/libssh2.so.1 /usr/lib/libgssapi_krb5.so.2 /usr/lib/libresolv.so.2 /usr/lib/libkrb5.so.3 /usr/lib/libk5crypto.so.3 /usr/lib/libcom_err.so.2 /usr/lib/libkrb5support.so.0 /usr/lib/
120-
# COPY --from=builder /lib/libgcrypt.so.20 /lib/libgpg-error.so.0 /lib/
121-
# telegraf dependencies (note: done)
119+
# telegraf dependencies
122120
COPY --from=builder /usr/lib/libresolv.so.2 /usr/lib/libc.so.6 /usr/lib/
123-
# mdsd dependencies (note: done)
121+
# mdsd dependencies
124122
COPY --from=builder /usr/sbin/../lib/libpthread.so.0 /usr/sbin/../lib/libdl.so.2 /usr/sbin/../lib/libsymcrypt.so.103 /usr/sbin/../lib/librt.so.1 /usr/sbin/../lib/libm.so.6 /usr/sbin/../lib/libc.so.6 /usr/sbin/../lib/libstdc++.so.6 /usr/sbin/../lib/libgcc_s.so.1 /usr/sbin/../lib/
125123
COPY --from=builder /opt/microsoft/azure-mdsd/lib/libtcmalloc_minimal.so.4 /opt/microsoft/azure-mdsd/lib/
126-
# COPY --from=builder /opt/microsoft/azure-mdsd/lib/libsymcrypt.so.103 /opt/microsoft/azure-mdsd/lib/
127-
# logrotate dependencies (note: done)
128-
# removed libpcre.so.1 for being unrecognized during build - assuming it's not part of AzureLinux 3.0
129-
# COPY --from=builder /lib/libselinux.so.1 /lib/
124+
# logrotate dependencies
130125
COPY --from=builder /usr/lib/libpopt.so.0 /usr/lib/libc.so.6 /usr/lib/
131126
# curl dependencies (note:done)
132127
# libssl.so.1.1 & libcrypto.so.1.1 are already available with openssl in distroless and copying them over causes FIPS HMAC verification failures

0 commit comments

Comments
 (0)