dockerfile

Azure · Nov 8, 2023 · 312ebcc · 312ebcc
1 parent 3fd2a1e
commit 312ebcc
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/otelcollector/build/linux/Dockerfile b/otelcollector/build/linux/Dockerfile
@@ -138,39 +138,39 @@ COPY --from=builder /lib/libcurl.so.4 /lib/libz.so.1 /lib/libc.so.6 /lib/libnght
 COPY --from=builder /usr/lib/libkrb5.so.3 /usr/lib/libk5crypto.so.3 /usr/lib/libcom_err.so.2 /usr/lib/libkrb5support.so.0 /usr/lib/libresolv.so.2 /usr/lib/
 
 # debug image
-# COPY --from=builder /busybin /busybin
-# COPY --from=builder /static/react /static/react
-# COPY --from=builder /var/lib/logrotate /var/lib/logrotate
-# COPY --from=builder /var/spool/cron /var/spool/cron
-# COPY --from=builder /usr/share/p11-kit /usr/share/p11-kit
-# COPY --from=builder /usr/share/pki/ /usr/share/pki
-# COPY --from=builder /usr/bin/bash /usr/bin/bash
-# COPY --from=builder /usr/sbin/busybox /usr/sbin/busybox
-# COPY --from=builder /usr/bin/fluent-bit /usr/bin/fluent-bit
-# COPY --from=builder /usr/bin/telegraf /usr/bin/telegraf
-# COPY --from=builder /usr/sbin/crond /usr/sbin/crond
-# COPY --from=builder /usr/bin/vim /usr/bin/vim
-# COPY --from=builder /usr/share/vim /usr/share/vim
-# COPY --from=builder /usr/sbin/logrotate /usr/sbin/logrotate
-# COPY --from=builder /usr/bin/gzip /usr/bin/
-# COPY --from=builder /usr/bin/update-ca-trust /usr/bin
-# COPY --from=builder /bin/sh /bin/sh
-# COPY --from=builder /usr/bin/p11-kit /usr/bin
-# COPY --from=builder /usr/bin/trust /usr/bin
-# COPY --from=builder /lib/libreadline.so.8 /lib/
-# COPY --from=builder /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6 /usr/lib/
-# COPY --from=builder /lib/libselinux.so.1 /lib/libpam.so.0 /lib/libc.so.6 /lib/libpcre.so.1 /lib/libaudit.so.1 /lib/libcap-ng.so.0/ /lib/
-# COPY --from=builder /lib/libm.so.6 /lib/libtinfo.so.6 /lib/
-# COPY --from=builder /lib/libssl.so.1.1 /lib/libcrypto.so.1.1 /lib/libyaml-0.so.2 /lib/libsystemd.so.0 /lib/libm.so.6 /lib/libgcc_s.so.1 /lib/liblzma.so.5 /lib/liblz4.so.1 /lib/libcap.so.2 /lib/libgcrypt.so.20 /lib/libgpg-error.so.0 /lib/
-# COPY --from=builder /lib/libc.so.6 /lib/
-# COPY --from=builder /lib/libselinux.so.1 /lib/libpopt.so.0 /lib/libpcre.so.1 /lib/
-# COPY --from=builder /lib/libreadline.so.8 /lib/libc.so.6 /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6 /lib/
-# COPY --from=builder /usr/lib64/pkcs11 /usr/lib64
-# COPY --from=builder /usr/lib/pkcs11 /usr/lib/
-# COPY --from=builder /usr/libexec/p11-kit /usr/libexec
-# COPY --from=builder /lib/libp11-kit.so.0 /lib/libtasn1.so.6 /lib/libc.so.6 /lib/libffi.so.8 /lib/
-# COPY --from=builder /usr/lib/p11-kit-trust.so /usr/lib/p11-kit-proxy.so /usr/lib/libp11-kit.so.0.3.0 /usr/lib/libnssckbi.so /usr/lib/
-# COPY --from=builder /usr/lib/pkcs11/p11-kit-trust.so /usr/lib/pkcs11/
+COPY --from=builder /busybin /busybin
+COPY --from=builder /static/react /static/react
+COPY --from=builder /var/lib/logrotate /var/lib/logrotate
+COPY --from=builder /var/spool/cron /var/spool/cron
+COPY --from=builder /usr/share/p11-kit /usr/share/p11-kit
+COPY --from=builder /usr/share/pki/ /usr/share/pki
+COPY --from=builder /usr/bin/bash /usr/bin/bash
+COPY --from=builder /usr/sbin/busybox /usr/sbin/busybox
+COPY --from=builder /usr/bin/fluent-bit /usr/bin/fluent-bit
+COPY --from=builder /usr/bin/telegraf /usr/bin/telegraf
+COPY --from=builder /usr/sbin/crond /usr/sbin/crond
+COPY --from=builder /usr/bin/vim /usr/bin/vim
+COPY --from=builder /usr/share/vim /usr/share/vim
+COPY --from=builder /usr/sbin/logrotate /usr/sbin/logrotate
+COPY --from=builder /usr/bin/gzip /usr/bin/
+COPY --from=builder /usr/bin/update-ca-trust /usr/bin
+COPY --from=builder /bin/sh /bin/sh
+COPY --from=builder /usr/bin/p11-kit /usr/bin
+COPY --from=builder /usr/bin/trust /usr/bin
+COPY --from=builder /lib/libreadline.so.8 /lib/
+COPY --from=builder /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6 /usr/lib/
+COPY --from=builder /lib/libselinux.so.1 /lib/libpam.so.0 /lib/libc.so.6 /lib/libpcre.so.1 /lib/libaudit.so.1 /lib/libcap-ng.so.0/ /lib/
+COPY --from=builder /lib/libm.so.6 /lib/libtinfo.so.6 /lib/
+COPY --from=builder /lib/libssl.so.1.1 /lib/libcrypto.so.1.1 /lib/libyaml-0.so.2 /lib/libsystemd.so.0 /lib/libm.so.6 /lib/libgcc_s.so.1 /lib/liblzma.so.5 /lib/liblz4.so.1 /lib/libcap.so.2 /lib/libgcrypt.so.20 /lib/libgpg-error.so.0 /lib/
+COPY --from=builder /lib/libc.so.6 /lib/
+COPY --from=builder /lib/libselinux.so.1 /lib/libpopt.so.0 /lib/libpcre.so.1 /lib/
+COPY --from=builder /lib/libreadline.so.8 /lib/libc.so.6 /usr/lib/libncursesw.so.6 /usr/lib/libtinfo.so.6 /lib/
+COPY --from=builder /usr/lib64/pkcs11 /usr/lib64
+COPY --from=builder /usr/lib/pkcs11 /usr/lib/
+COPY --from=builder /usr/libexec/p11-kit /usr/libexec
+COPY --from=builder /lib/libp11-kit.so.0 /lib/libtasn1.so.6 /lib/libc.so.6 /lib/libffi.so.8 /lib/
+COPY --from=builder /usr/lib/p11-kit-trust.so /usr/lib/p11-kit-proxy.so /usr/lib/libp11-kit.so.0.3.0 /usr/lib/libnssckbi.so /usr/lib/
+COPY --from=builder /usr/lib/pkcs11/p11-kit-trust.so /usr/lib/pkcs11/
 
 # Expose the port on which the application listens
 EXPOSE 8080

diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d
+version: 6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2
 
 # This is the version number of the application being deployed (basically, imagetag for the image built/compatible with this chart semver above). This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d"
+appVersion: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2"
 # dependencies:
 # - name: prometheus-node-exporter
 #   version: "4.21.0"

diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml
@@ -36,10 +36,10 @@ AzureMonitorMetrics:
       - validatingwebhookconfigurations
       - volumeattachments
   ImageRepository: "/azuremonitor/containerinsights/cidev/prometheus-collector/images"
-  ImageTag: "6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d"
-  ImageTagWin: "6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d-win"
-  ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d-targetallocator"
-  ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-11-01-2023-12b1d17d-cfg"
+  ImageTag: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2"
+  ImageTagWin: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-win"
+  ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-targetallocator"
+  ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-11-08-2023-3fd2a1e2-cfg"
   TargetAllocatorEnabled: false
   DeploymentReplicas: 1
   # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner.