Skip to content

Commit 3545fca

Browse files
authored
revert: [NPM] [CVEs] [v1.5] Revert Manual NPM Linux Dockerfile Package Installations (#3679)
* fix: [NPM] Reduce/Refactor Noisy NPM Logs (#3468) * removed all logs from npm dataplane (except error/warning logs) * removed all logs from npm controller (except error/warning logs) * restored logs that are ununused by current npm (v2) * removed test files * resolved comments * keep log related to reconciling chain placement when the chain is not in the right place * added bootup logs back * Removed two more noisy logs * Add loglevel config option when printing application insight logs * Updated all non-error/warning logs to commented out and with a vap TODO * fixed typo * small typo fix * updated configmap with loglevel * updated default value * added a default value for loglevel * fixed typo in json * removed comma * changed loglevel to info in configmap * add a short sleep in TestNetPolInBackgroundSkipAddAfterRemove * test remove dataplane changes to see if race condition fixes * Revert "test remove dataplane changes to see if race condition fixes" This reverts commit 08697eb. * test * Revert "test" This reverts commit 449c2af. * test * update dataplane to test if changes are flagged in race * added stop channels to unit tests to avoid race condtiions * add non noisy logs back * increased time * revert time change after RunPeriodicTasks * test with 1000 seconds * 5000 milliseconds * tweaked the delay * update to 1500 for defer * increased to 1500 * increase to 2000 * removed kubernetes * removed hardcoded package versions from npm dockerfile
1 parent c72b816 commit 3545fca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

npm/linux.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ RUN CGO_ENABLED=0 go build -v -o /usr/local/bin/azure-npm -ldflags "-X main.vers
88

99
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:20.04
1010
COPY --from=builder /usr/local/bin/azure-npm /usr/bin/azure-npm
11-
RUN apt-get update && apt-get install -y libc-bin=2.31-0ubuntu9.17 libc6=2.31-0ubuntu9.17 libtasn1-6=4.16.0-2ubuntu0.1 libgnutls30=3.6.13-2ubuntu1.12 iptables ipset ca-certificates && apt-get autoremove -y && apt-get clean
11+
RUN apt-get update && apt-get install -y iptables ipset ca-certificates && apt-get autoremove -y && apt-get clean
1212
RUN chmod +x /usr/bin/azure-npm
1313
ENTRYPOINT ["/usr/bin/azure-npm", "start"]

0 commit comments

Comments
 (0)