diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..6a6c20d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" + groups: + dependencies: + applies-to: "version-updates" + patterns: + - "*" diff --git a/Makefile b/Makefile index d1a3e87..4f0f2e8 100644 --- a/Makefile +++ b/Makefile @@ -1,107 +1,3 @@ -build-fluent-bit-v1.6.10: - ${MAKE} -C fluent-bit/v1.6.10 - -build-kube-state-metrics-v1.9.7: - ${MAKE} -C kube-state-metrics/v1.9.7 - -build-kube-state-metrics-v1.9.8: - ${MAKE} -C kube-state-metrics/v1.9.8 - -build-prometheus-operator-v0.43.2: - ${MAKE} -C prometheus-operator/v0.43.2 - -build-prometheus-operator-v0.44.0: - ${MAKE} -C prometheus-operator/v0.44.0 - -build-prometheus-v2.22.1: - ${MAKE} -C prometheus/v2.22.1 - -build-node-exporter-v1.0.1: - ${MAKE} -C node-exporter/v1.0.1 - -build-node-exporter-v1.3.1: - ${MAKE} -C node-exporter/v1.3.1 - -build-prometheus-config-reloader-v0.43.2: - ${MAKE} -C prometheus-config-reloader/v0.43.2 - -build-prometheus-config-reloader-v0.44.0: - ${MAKE} -C prometheus-config-reloader/v0.44.0 - -build-thanos-v0.10.0: - ${MAKE} -C thanos/v0.10.0 - -build-thanos-v0.25.2: - ${MAKE} -C thanos/v0.25.2 - -build-metrics-server-0.4.2-debian-10-r58: - ${MAKE} -C metrics-server/0.4.2-debian-10-r58 - -build-metrics-server-0.6.1-debian-10-r67: - ${MAKE} -C metrics-server/0.6.1-debian-10-r67 - -build-sumologic-kubernetes-setup-v3.0.0: - ${MAKE} -C sumologic-kubernetes-setup/v3.0.0 - -build-sumologic-kubernetes-setup-v3.3.0: - ${MAKE} -C sumologic-kubernetes-setup/v3.3.0 - -build-sumologic-kubernetes-setup-v3.4.0: - ${MAKE} -C sumologic-kubernetes-setup/v3.4.0 - -build-telegraf-operator-v1.1.1: - ${MAKE} -C telegraf-operator/v1.1.1 - -build-telegraf-operator-v1.3.5: - ${MAKE} -C telegraf-operator/v1.3.5 - -.PHONY: build-sumo-ubi-minimal-8.4 -build-sumo-ubi-minimal-8.4: - ${MAKE} -C sumo-ubi-minimal/8.4 build - -.PHONY: push-sumo-ubi-minimal-8.4 -push-sumo-ubi-minimal-8.4: - ${MAKE} -C sumo-ubi-minimal/8.4 push - -build-kube-rbac-proxy-v0.5.0: - ${MAKE} -C kube-rbac-proxy/v0.5.0 - -build-kube-rbac-proxy-v0.8.0: - ${MAKE} -C kube-rbac-proxy/v0.8.0 - -build-telegraf-1.14.4: - ${MAKE} -C telegraf/1.14.4 - -build-telegraf-1.21.2: - ${MAKE} -C telegraf/1.21.2 - -build-opentelemetry-collector-0.22.0-sumo: - ${MAKE} -C opentelemetry-collector/0.22.0-sumo - -build-sumologic-otel-collector-0.54.0-sumo-0: - ${MAKE} -C sumologic-otel-collector/0.54.0-sumo-0 - -build-sumologic-otel-collector-0.56.0-sumo-0: - ${MAKE} -C sumologic-otel-collector/0.56.0-sumo-0 - -build-sumologic-otel-collector-0.57.2-sumo-1: - ${MAKE} -C sumologic-otel-collector/0.57.2-sumo-1 - -build-kubernetes-fluentd-1.12.2-sumo-0: - ${MAKE} -C kubernetes-fluentd/1.12.2-sumo-0 - -build-kubernetes-fluentd-1.14.6-sumo-5: - ${MAKE} -C kubernetes-fluentd/1.14.6-sumo-5 - -build-opentelemetry-operator-0.51.0: - ${MAKE} -C opentelemetry-operator/0.51.0 - -build-opentelemetry-operator-0.63.1: - ${MAKE} -C opentelemetry-operator/0.63.1 - -build-opentelemetry-collector-contib-0.64.1: - ${MAKE} -C opentelemetry-collector-contrib/0.64.1 - list-images-v4: ./scripts/list-images.py \ --fetch-base \ diff --git a/Makefile.common b/Makefile.common index 5e212b9..6e3e9da 100644 --- a/Makefile.common +++ b/Makefile.common @@ -8,7 +8,7 @@ ifeq ($(UPSTREAM_VERSION),"") endif ifeq ($(IMAGE_NAME),"") - $(error IMAGE_NAME is required) + IMAGE_NAME = $(shell basename $(shell pwd)) endif build: diff --git a/autoinstrumentation-dotnet/Dockerfile b/autoinstrumentation-dotnet/Dockerfile index eed64a0..c60d1ad 100644 --- a/autoinstrumentation-dotnet/Dockerfile +++ b/autoinstrumentation-dotnet/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/SumoLogic/opentelemetry-collector-contrib/blob/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/cmd/otelcontribcol/Dockerfile FROM public.ecr.aws/sumologic/autoinstrumentation-dotnet:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/autoinstrumentation-dotnet/Makefile b/autoinstrumentation-dotnet/Makefile index 672a7a3..371919b 100644 --- a/autoinstrumentation-dotnet/Makefile +++ b/autoinstrumentation-dotnet/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "autoinstrumentation-dotnet" include ../Makefile.common diff --git a/autoinstrumentation-java/Dockerfile b/autoinstrumentation-java/Dockerfile index 012456e..f2decdb 100644 --- a/autoinstrumentation-java/Dockerfile +++ b/autoinstrumentation-java/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/SumoLogic/opentelemetry-collector-contrib/blob/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/cmd/otelcontribcol/Dockerfile FROM public.ecr.aws/sumologic/autoinstrumentation-java:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/autoinstrumentation-java/Makefile b/autoinstrumentation-java/Makefile index c0e3640..371919b 100644 --- a/autoinstrumentation-java/Makefile +++ b/autoinstrumentation-java/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "autoinstrumentation-java" include ../Makefile.common diff --git a/autoinstrumentation-nodejs/Dockerfile b/autoinstrumentation-nodejs/Dockerfile index 4171322..5c175da 100644 --- a/autoinstrumentation-nodejs/Dockerfile +++ b/autoinstrumentation-nodejs/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/SumoLogic/opentelemetry-collector-contrib/blob/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/cmd/otelcontribcol/Dockerfile FROM public.ecr.aws/sumologic/autoinstrumentation-nodejs:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/autoinstrumentation-nodejs/Makefile b/autoinstrumentation-nodejs/Makefile index d0418a7..371919b 100644 --- a/autoinstrumentation-nodejs/Makefile +++ b/autoinstrumentation-nodejs/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "autoinstrumentation-nodejs" include ../Makefile.common diff --git a/autoinstrumentation-python/Dockerfile b/autoinstrumentation-python/Dockerfile index 5671da1..920927c 100644 --- a/autoinstrumentation-python/Dockerfile +++ b/autoinstrumentation-python/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/SumoLogic/opentelemetry-collector-contrib/blob/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/cmd/otelcontribcol/Dockerfile FROM public.ecr.aws/sumologic/autoinstrumentation-python:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/autoinstrumentation-python/Makefile b/autoinstrumentation-python/Makefile index 95fe07b..371919b 100644 --- a/autoinstrumentation-python/Makefile +++ b/autoinstrumentation-python/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "autoinstrumentation-python" include ../Makefile.common diff --git a/busybox/Dockerfile b/busybox/Dockerfile index 164c677..ace4dd4 100644 --- a/busybox/Dockerfile +++ b/busybox/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi:8.6 +FROM registry.access.redhat.com/ubi9/ubi:9.4 ADD LICENSE /licenses/ USER 65532:65532 diff --git a/busybox/Makefile b/busybox/Makefile index cefe799..ee18329 100644 --- a/busybox/Makefile +++ b/busybox/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "" -IMAGE_NAME := "busybox" include ../Makefile.common diff --git a/fluent-bit/Dockerfile b/fluent-bit/Dockerfile index 7b27350..31a2710 100644 --- a/fluent-bit/Dockerfile +++ b/fluent-bit/Dockerfile @@ -1,7 +1,6 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.8 -FROM registry.access.redhat.com/ubi8/ubi:8.8 as builder +FROM registry.access.redhat.com/ubi9/ubi:9.4 as builder ARG UPSTREAM_VERSION ARG BISON_VERSION=3.8.2 @@ -62,7 +61,7 @@ RUN install bin/fluent-bit /fluent-bit/bin/ RUN cp /tmp/src/conf/*.conf /fluent-bit/etc/ ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4 ARG UPSTREAM_VERSION ARG RELEASE @@ -78,7 +77,7 @@ LABEL name="Fluent Bit" \ io.k8s.description="$DESCRIPTION" \ maintainer="opensource-collection-team@sumologic.com" -RUN microdnf update && microdnf install -y openssl libpq systemd && microdnf clean all +RUN microdnf update -y && microdnf install -y openssl libpq systemd && microdnf clean all COPY --from=builder /fluent-bit /fluent-bit COPY --from=builder /tmp/src/LICENSE /licenses/ diff --git a/fluent-bit/Makefile b/fluent-bit/Makefile index 01d132e..371919b 100644 --- a/fluent-bit/Makefile +++ b/fluent-bit/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "fluent-bit" include ../Makefile.common diff --git a/fluent-bit/v1.6.10/Makefile b/fluent-bit/v1.6.10/Makefile deleted file mode 100644 index e5ed71b..0000000 --- a/fluent-bit/v1.6.10/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t fluent-bit:1.6.10-sumo-3-ubi diff --git a/kube-rbac-proxy/Dockerfile b/kube-rbac-proxy/Dockerfile index 105a83a..7ce1198 100644 --- a/kube-rbac-proxy/Dockerfile +++ b/kube-rbac-proxy/Dockerfile @@ -1,11 +1,10 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/brancz/kube-rbac-proxy/blob/${UPSTREAM_VERSION}/Dockerfile FROM public.ecr.aws/sumologic/kube-rbac-proxy:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/kube-rbac-proxy/Makefile b/kube-rbac-proxy/Makefile index c62ea73..371919b 100755 --- a/kube-rbac-proxy/Makefile +++ b/kube-rbac-proxy/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "kube-rbac-proxy" include ../Makefile.common diff --git a/kube-rbac-proxy/v0.5.0/Dockerfile b/kube-rbac-proxy/v0.5.0/Dockerfile deleted file mode 100644 index 6fb559d..0000000 --- a/kube-rbac-proxy/v0.5.0/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/brancz/kube-rbac-proxy/blob/a6da502b4a4abad511cb1afa87b0b52c74a89987/Dockerfile -FROM gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Kube-rbac-proxy" \ - vendor="Sumo Logic" \ - version="0.5.0" \ - release="1" \ - summary="UBI based kube-rbac-proxy" \ - description="The kube-rbac-proxy is a small HTTP proxy for a single upstream, that can perform RBAC authorization against the Kubernetes API using SubjectAccessReview." \ - maintainer="collection@sumologic.com" - -RUN yum update -y \ - && yum install -y ca-certificates - -COPY --from=builder \ - /kube-rbac-proxy \ - / -ADD https://raw.githubusercontent.com/brancz/kube-rbac-proxy/a6da502b4a4abad511cb1afa87b0b52c74a89987/LICENSE \ - /licenses/LICENSE - -ENTRYPOINT ["./kube-rbac-proxy"] -ENV USER_ID 1000 -ENV USER_NAME kube-rbac-proxy-user -RUN adduser --uid $USER_ID $USER_NAME -USER $USER_ID - -EXPOSE 8080 diff --git a/kube-rbac-proxy/v0.5.0/Makefile b/kube-rbac-proxy/v0.5.0/Makefile deleted file mode 100644 index dd54b46..0000000 --- a/kube-rbac-proxy/v0.5.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kube-rbac-proxy:v0.5.0-ubi diff --git a/kube-rbac-proxy/v0.8.0/Dockerfile b/kube-rbac-proxy/v0.8.0/Dockerfile deleted file mode 100644 index 1c2760b..0000000 --- a/kube-rbac-proxy/v0.8.0/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/brancz/kube-rbac-proxy/blob/v0.8.0/Dockerfile -FROM gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based kube-rbac-proxy" \ - DESCRIPTION="The kube-rbac-proxy is a small HTTP proxy for a single upstream, that can perform RBAC authorization against the Kubernetes API using SubjectAccessReview." - -LABEL name="Kube-rbac-proxy" \ - vendor="Sumo Logic" \ - version="0.8.0" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -RUN yum update -y \ - && yum install -y ca-certificates - -COPY --from=builder \ - /usr/local/bin/kube-rbac-proxy \ - /usr/local/bin/kube-rbac-proxy -ADD https://raw.githubusercontent.com/brancz/kube-rbac-proxy/v0.8.0/LICENSE \ - /licenses/LICENSE - -ENTRYPOINT ["/usr/local/bin/kube-rbac-proxy"] - -USER 65532:65532 -EXPOSE 8080 diff --git a/kube-rbac-proxy/v0.8.0/Makefile b/kube-rbac-proxy/v0.8.0/Makefile deleted file mode 100644 index fdc2677..0000000 --- a/kube-rbac-proxy/v0.8.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kube-rbac-proxy:v0.8.0-ubi diff --git a/kube-state-metrics/Dockerfile b/kube-state-metrics/Dockerfile index 4b15fe5..b0e55f5 100644 --- a/kube-state-metrics/Dockerfile +++ b/kube-state-metrics/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/kubernetes/kube-state-metrics/blob/v${UPSTREAM_VERSION}/Dockerfile FROM public.ecr.aws/sumologic/kube-state-metrics:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/kube-state-metrics/Makefile b/kube-state-metrics/Makefile index 4da6c54..371919b 100644 --- a/kube-state-metrics/Makefile +++ b/kube-state-metrics/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "kube-state-metrics" include ../Makefile.common diff --git a/kube-state-metrics/v1.9.7/Dockerfile b/kube-state-metrics/v1.9.7/Dockerfile deleted file mode 100644 index f0276be..0000000 --- a/kube-state-metrics/v1.9.7/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/kubernetes/kube-state-metrics/blob/b3fa5852d755c912c2601c53781a58567c822b81/Dockerfile -FROM quay.io/coreos/kube-state-metrics:v1.9.7 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Kube-state-metrics" \ - vendor="Sumo Logic" \ - version="1.9.7" \ - release="1" \ - summary="UBI based kube-state-metrics" \ - description="kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects." \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /kube-state-metrics \ - / -ADD https://raw.githubusercontent.com/kubernetes/kube-state-metrics/b3fa5852d755c912c2601c53781a58567c822b81/LICENSE \ - /licenses/LICENSE - -USER nobody - -ENTRYPOINT ["/kube-state-metrics", "--port=8080", "--telemetry-port=8081"] - -EXPOSE 8080 8081 diff --git a/kube-state-metrics/v1.9.7/Makefile b/kube-state-metrics/v1.9.7/Makefile deleted file mode 100644 index 501c4d2..0000000 --- a/kube-state-metrics/v1.9.7/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kube-state-metrics:v1.9.8-ubi diff --git a/kube-state-metrics/v1.9.8/Dockerfile b/kube-state-metrics/v1.9.8/Dockerfile deleted file mode 100644 index 951fe15..0000000 --- a/kube-state-metrics/v1.9.8/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/kubernetes/kube-state-metrics/blob/v1.9.8/Dockerfile -FROM quay.io/coreos/kube-state-metrics:v1.9.8 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based kube-state-metrics" \ - DESCRIPTION="kube-state-metrics is a simple service that listens to the Kubernetes API server and generates metrics about the state of the objects." - -LABEL name="Kube-state-metrics" \ - vendor="Sumo Logic" \ - version="1.9.8" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /kube-state-metrics \ - / -ADD https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v1.9.8/LICENSE \ - /licenses/LICENSE - -USER nobody - -ENTRYPOINT ["/kube-state-metrics", "--port=8080", "--telemetry-port=8081"] - -EXPOSE 8080 8081 diff --git a/kube-state-metrics/v1.9.8/Makefile b/kube-state-metrics/v1.9.8/Makefile deleted file mode 100644 index 501c4d2..0000000 --- a/kube-state-metrics/v1.9.8/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kube-state-metrics:v1.9.8-ubi diff --git a/kubernetes-fluentd/1.12.2-sumo-0/Dockerfile b/kubernetes-fluentd/1.12.2-sumo-0/Dockerfile deleted file mode 100644 index ce24ca1..0000000 --- a/kubernetes-fluentd/1.12.2-sumo-0/Dockerfile +++ /dev/null @@ -1,87 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/2d2b7693b87f9a0c175740e9674455051c709409/Dockerfile -FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.12.2-sumo-0 as sumo-image - -## Build RedHat compliant image for fluentd -## ref: https://github.com/fluent/fluentd-docker-image/blob/4e0810850460c7669d7a8ad15d5a3c8ddf28652c/v1.12/debian/Dockerfile -FROM registry.access.redhat.com/ubi8/ruby-26:1 as fluentd - -ENV TINI_VERSION=0.18.0 - -USER root -# NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver. -# This hack is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. -# Do not split this into multiple RUN! -# Docker creates a layer for every RUN-Statement -# therefore an 'apt-get purge' has no effect -RUN gem install oj -v 3.10.18 \ - && gem install json -v 2.4.1 \ - && gem install resolv -v 0.2.1 \ - && gem install async-http -v 0.54.0 \ - && gem install ext_monitor -v 0.1.2 \ - && gem install fluentd -v 1.12.2 \ - && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-amd64" \ - && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-amd64.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && rm -r /usr/local/bin/tini.asc \ - && chmod +x /usr/local/bin/tini \ - && tini -h \ - && wget -O /tmp/jemalloc-4.5.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/4.5.0/jemalloc-4.5.0.tar.bz2 \ - && cd /tmp && tar -xjf jemalloc-4.5.0.tar.bz2 && cd jemalloc-4.5.0/ \ - && ./configure && make \ - && mv lib/libjemalloc.so.2 /usr/lib \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/2.*/gems/fluentd-*/test - -RUN groupadd -r fluent && useradd -r -g fluent fluent \ - # for log storage (maybe shared with host) - && mkdir -p /fluentd/log \ - # configuration/plugins path (default: copied from .) - && mkdir -p /fluentd/etc /fluentd/plugins \ - && chown -R fluent /fluentd && chgrp -R fluent /fluentd - -COPY --from=sumo-image /fluentd/etc/fluent.conf /fluentd/etc/ -COPY --from=sumo-image /bin/entrypoint.sh /bin/ - -ENV FLUENTD_CONF="fluent.conf" - -ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" -# NOTE: resolv v0.2.1 includes the fix for CPU spike issue due to DNS resolver. -# Forcing to load specific version of resolv (instead of bundled by default) is needed for Ruby 2.6.7, 2.7.3 and 3.0.1. -ENV RUBYLIB="/usr/local/bundle/gems/resolv-0.2.1/lib" -EXPOSE 24224 5140 - -USER fluent -ENTRYPOINT ["tini", "--", "/bin/entrypoint.sh"] -CMD ["fluentd"] - -FROM fluentd - -LABEL name="Kubernetes-fluentd" \ - vendor="Sumo Logic" \ - version="1.12.2-sumo-0" \ - release="1" \ - summary="UBI based kubernetes-fluentd" \ - description="Kubernetes-fluentd is a custom Fluentd build with plugins used by Sumo Logic Kubernetes Collection." \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-fluentd/2d2b7693b87f9a0c175740e9674455051c709409/LICENSE \ - /licenses/LICENSE - -## ref: https://github.com/yashoza19/sumologic-kubernetes-fluentd/blob/c22a932b22ffc591bbc6f2a0ac624c323c1b5006/Dockerfile -USER root -RUN yum install -y jq \ - && gem install rdoc -v 6.3.1 \ - && gem cleanup -COPY --from=sumo-image --chown=fluent:fluent /usr/local/bundle /usr/local/share/gems -COPY --from=sumo-image /bin/./entrypoint.sh /bin/ -COPY ./snappy.rpm . -COPY ./snappy-devel.rpm . -RUN rpm -i snappy.rpm \ - && rpm -i snappy-devel.rpm \ - && rm snappy.rpm snappy-devel.rpm \ - && gem pristine ffi -v 1.15.0 \ - && gem pristine http-parser --version 1.2.3 \ - && gem pristine snappy --version 0.0.17 \ - && gem pristine unf_ext --version 0.0.7.7 -USER 999:999 diff --git a/kubernetes-fluentd/1.12.2-sumo-0/Makefile b/kubernetes-fluentd/1.12.2-sumo-0/Makefile deleted file mode 100644 index 2c064e9..0000000 --- a/kubernetes-fluentd/1.12.2-sumo-0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kubernetes-fluentd:1.12.2-sumo-0-ubi diff --git a/kubernetes-fluentd/1.12.2-sumo-0/snappy-devel.rpm b/kubernetes-fluentd/1.12.2-sumo-0/snappy-devel.rpm deleted file mode 100644 index 735b1c0..0000000 Binary files a/kubernetes-fluentd/1.12.2-sumo-0/snappy-devel.rpm and /dev/null differ diff --git a/kubernetes-fluentd/1.12.2-sumo-0/snappy.rpm b/kubernetes-fluentd/1.12.2-sumo-0/snappy.rpm deleted file mode 100644 index 978d158..0000000 Binary files a/kubernetes-fluentd/1.12.2-sumo-0/snappy.rpm and /dev/null differ diff --git a/kubernetes-fluentd/1.14.6-sumo-5/Dockerfile b/kubernetes-fluentd/1.14.6-sumo-5/Dockerfile deleted file mode 100644 index 11f75d1..0000000 --- a/kubernetes-fluentd/1.14.6-sumo-5/Dockerfile +++ /dev/null @@ -1,94 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/sumologic-kubernetes-fluentd/blob/v1.14.6-sumo-5/Dockerfile -FROM public.ecr.aws/sumologic/kubernetes-fluentd:1.14.6-sumo-5 as sumo-image - -## Build RedHat compliant image for fluentd -## ref: https://github.com/fluent/fluentd-docker-image/blob/22c688d6ba1ab83dbdb74265fca26630ce032d6b/v1.14/debian/Dockerfile -FROM registry.access.redhat.com/ubi8/ruby-27:1 as fluentd - -ENV TINI_VERSION=0.18.0 - -USER root - -# Do not split this into multiple RUN! -# Docker creates a layer for every RUN-Statement -# therefore an 'apt-get purge' has no effect -RUN gem install oj -v 3.10.18 \ - && gem install json -v 2.4.1 \ - && gem install async-http -v 0.54.0 \ - && gem install ext_monitor -v 0.1.2 \ - && gem install fluentd -v 1.14.6 \ - && wget -O /usr/local/bin/tini "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-amd64" \ - && wget -O /usr/local/bin/tini.asc "https://github.com/krallin/tini/releases/download/v$TINI_VERSION/tini-amd64.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6380DC428747F6C393FEACA59A84159D7001A4E5 \ - && gpg --batch --verify /usr/local/bin/tini.asc /usr/local/bin/tini \ - && rm -r /usr/local/bin/tini.asc \ - && chmod +x /usr/local/bin/tini \ - && tini -h \ - && wget -O /tmp/jemalloc-4.5.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/4.5.0/jemalloc-4.5.0.tar.bz2 \ - && cd /tmp && tar -xjf jemalloc-4.5.0.tar.bz2 && cd jemalloc-4.5.0/ \ - && ./configure && make \ - && mv lib/libjemalloc.so.2 /usr/lib \ - && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/2.*/gems/fluentd-*/test - -RUN groupadd -r fluent && useradd -r -g fluent fluent \ - # for log storage (maybe shared with host) - && mkdir -p /fluentd/log \ - # configuration/plugins path (default: copied from .) - && mkdir -p /fluentd/etc /fluentd/plugins \ - && chown -R fluent /fluentd && chgrp -R fluent /fluentd - - -COPY --from=sumo-image /fluentd/etc/fluent.conf /fluentd/etc/ -COPY --from=sumo-image /bin/entrypoint.sh /bin/ - - -ENV FLUENTD_CONF="fluent.conf" - -ENV LD_PRELOAD="/usr/lib/libjemalloc.so.2" -EXPOSE 24224 5140 - -USER fluent -ENTRYPOINT ["tini", "--", "/bin/entrypoint.sh"] -CMD ["fluentd"] - -FROM fluentd - -ENV SUMMARY="UBI based kubernetes-fluentd" \ - DESCRIPTION="Kubernetes-fluentd is a custom Fluentd build with plugins used by Sumo Logic Kubernetes Collection." - -LABEL name="Kubernetes-fluentd" \ - vendor="Sumo Logic" \ - version="1.14.6-sumo-5" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-fluentd/v1.14.6-sumo-5//LICENSE \ - /licenses/LICENSE - -## ref: https://github.com/yashoza19/sumologic-kubernetes-fluentd/blob/c22a932b22ffc591bbc6f2a0ac624c323c1b5006/Dockerfile -USER root -RUN yum install -y jq \ - && gem install rdoc -v 6.3.1 \ - && gem cleanup -COPY --from=sumo-image --chown=fluent:fluent /usr/local/bundle /usr/local/share/gems -COPY --from=sumo-image /bin/./entrypoint.sh /bin/ -COPY ./snappy.rpm . -COPY ./snappy-devel.rpm . -RUN rpm -i snappy.rpm \ - && rpm -i snappy-devel.rpm \ - && rm snappy.rpm snappy-devel.rpm \ - && gem pristine date --version 2.0.1 \ - && gem pristine ffi --version 1.15.5 \ - && gem pristine msgpack --version 1.5.1 \ - && gem pristine http-parser --version 1.2.3 \ - && gem pristine psych --version 4.0.4 \ - && gem pristine snappy --version 0.0.17 \ - && gem pristine unf_ext --version 0.0.8.2 \ - && gem pristine yajl-ruby --version 1.4.2 -USER 999:999 diff --git a/kubernetes-fluentd/1.14.6-sumo-5/Makefile b/kubernetes-fluentd/1.14.6-sumo-5/Makefile deleted file mode 100644 index eae820e..0000000 --- a/kubernetes-fluentd/1.14.6-sumo-5/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t kubernetes-fluentd:1.14.6-sumo-5-ubi diff --git a/kubernetes-fluentd/1.14.6-sumo-5/snappy-devel.rpm b/kubernetes-fluentd/1.14.6-sumo-5/snappy-devel.rpm deleted file mode 100644 index 735b1c0..0000000 Binary files a/kubernetes-fluentd/1.14.6-sumo-5/snappy-devel.rpm and /dev/null differ diff --git a/kubernetes-fluentd/1.14.6-sumo-5/snappy.rpm b/kubernetes-fluentd/1.14.6-sumo-5/snappy.rpm deleted file mode 100644 index 978d158..0000000 Binary files a/kubernetes-fluentd/1.14.6-sumo-5/snappy.rpm and /dev/null differ diff --git a/metrics-server/0.4.2-debian-10-r58/Dockerfile b/metrics-server/0.4.2-debian-10-r58/Dockerfile deleted file mode 100644 index 107b46d..0000000 --- a/metrics-server/0.4.2-debian-10-r58/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/bitnami/bitnami-docker-metrics-server/blob/3ad9d947867728d52a8b3fedd6e5fb205af464f8/0/debian-10/Dockerfile -FROM docker.io/bitnami/metrics-server:0.4.2-debian-10-r58 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -COPY --from=builder /opt/bitnami /opt/bitnami - -LABEL name="metrics-server" \ - vendor="Sumo Logic" \ - version="0.4.2-debian-10-r58" \ - release="1" \ - summary="UBI based metrics-server" \ - description="Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node." \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/bitnami/bitnami-docker-metrics-server/3ad9d947867728d52a8b3fedd6e5fb205af464f8/LICENSE \ - /licenses/LICENSE - -RUN chmod g+rwX /opt/bitnami -RUN chown -R 1001:root /opt/bitnami/metrics-server && chmod -R g+rwX /opt/bitnami/metrics-server -ENV BITNAMI_APP_NAME="metrics-server" \ - BITNAMI_IMAGE_VERSION="0.4.2-debian-10-r58" \ - PATH="/opt/bitnami/metrics-server/bin:$PATH" - -EXPOSE 8443 - -WORKDIR /opt/bitnami/metrics-server -USER 1001 -ENTRYPOINT [ "metrics-server", "--secure-port=8443", "--cert-dir=/opt/bitnami/metrics-server/certificates" ] diff --git a/metrics-server/0.4.2-debian-10-r58/Makefile b/metrics-server/0.4.2-debian-10-r58/Makefile deleted file mode 100644 index fbc24bf..0000000 --- a/metrics-server/0.4.2-debian-10-r58/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t metrics-server:0.4.2-debian-10-r58-ubi diff --git a/metrics-server/0.6.1-debian-10-r67/Dockerfile b/metrics-server/0.6.1-debian-10-r67/Dockerfile deleted file mode 100644 index efd10ec..0000000 --- a/metrics-server/0.6.1-debian-10-r67/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/bitnami/bitnami-docker-metrics-server/blob/0.6.1-debian-10-r67/0/debian-10/Dockerfile -FROM docker.io/bitnami/metrics-server:0.6.1-debian-10-r67 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -COPY --from=builder /opt/bitnami /opt/bitnami - -ENV SUMMARY="UBI based metrics-server" \ - DESCRIPTION="Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node." - -LABEL name="metrics-server" \ - vendor="Sumo Logic" \ - version="0.6.1-debian-10-r67" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/bitnami/bitnami-docker-metrics-server/0.6.1-debian-10-r67/LICENSE.md \ - /licenses/LICENSE.md - -RUN chmod g+rwX /opt/bitnami -RUN chown -R 1001:root /opt/bitnami/metrics-server && chmod -R g+rwX /opt/bitnami/metrics-server -ENV BITNAMI_APP_NAME="metrics-server" \ - BITNAMI_IMAGE_VERSION="0.6.1-debian-10-r67" \ - PATH="/opt/bitnami/metrics-server/bin:$PATH" - -EXPOSE 8443 - -WORKDIR /opt/bitnami/metrics-server -USER 1001 -ENTRYPOINT [ "metrics-server", "--secure-port=8443", "--cert-dir=/opt/bitnami/metrics-server/certificates" ] diff --git a/metrics-server/0.6.1-debian-10-r67/Makefile b/metrics-server/0.6.1-debian-10-r67/Makefile deleted file mode 100644 index 3f27e95..0000000 --- a/metrics-server/0.6.1-debian-10-r67/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t metrics-server:0.6.1-debian-10-r67-ubi diff --git a/metrics-server/Dockerfile b/metrics-server/Dockerfile index 8f9438c..3f4907e 100644 --- a/metrics-server/Dockerfile +++ b/metrics-server/Dockerfile @@ -1,11 +1,10 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/bitnami/bitnami-docker-metrics-server/blob/${UPSTREAM_VERSION}/0/debian-10/Dockerfile FROM docker.io/bitnami/metrics-server:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/metrics-server/Makefile b/metrics-server/Makefile index a0da0ad..e5a9979 100755 --- a/metrics-server/Makefile +++ b/metrics-server/Makefile @@ -1,5 +1,3 @@ #!/usr/bin/make -f -IMAGE_NAME := "metrics-server" - include ../Makefile.common diff --git a/node-exporter/Dockerfile b/node-exporter/Dockerfile index d319247..33ab9f7 100644 --- a/node-exporter/Dockerfile +++ b/node-exporter/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/prometheus/node_exporter/blob/v1.3.1/Dockerfile FROM public.ecr.aws/sumologic/node-exporter:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/node-exporter/Makefile b/node-exporter/Makefile index 3ff80b4..371919b 100644 --- a/node-exporter/Makefile +++ b/node-exporter/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "node-exporter" include ../Makefile.common diff --git a/node-exporter/v1.0.1/Dockerfile b/node-exporter/v1.0.1/Dockerfile deleted file mode 100644 index 0d6f6b2..0000000 --- a/node-exporter/v1.0.1/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus/node_exporter/blob/3715be6ae899f2a9b9dbfd9c39f3e09a7bd4559f/Dockerfile -FROM quay.io/prometheus/node-exporter:v1.0.1 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Node-exporter" \ - vendor="Sumo Logic" \ - version="1.0.1" \ - release="1" \ - summary="UBI based node-exporter" \ - description="Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors." \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/node_exporter \ - /bin/node_exporter -ADD https://raw.githubusercontent.com/prometheus/node_exporter/3715be6ae899f2a9b9dbfd9c39f3e09a7bd4559f/LICENSE \ - /licenses/LICENSE - -EXPOSE 9100 -USER nobody -ENTRYPOINT [ "/bin/node_exporter" ] diff --git a/node-exporter/v1.0.1/Makefile b/node-exporter/v1.0.1/Makefile deleted file mode 100644 index 8ec1802..0000000 --- a/node-exporter/v1.0.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t node-exporter:v1.0.1-ubi diff --git a/node-exporter/v1.3.1/Dockerfile b/node-exporter/v1.3.1/Dockerfile deleted file mode 100644 index 0f0ab5c..0000000 --- a/node-exporter/v1.3.1/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus/node_exporter/blob/v1.3.1/Dockerfile -FROM quay.io/prometheus/node-exporter:v1.3.1 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based node-exporter" \ - DESCRIPTION="Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors." - -LABEL name="Node-exporter" \ - vendor="Sumo Logic" \ - version="1.3.1" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/node_exporter \ - /bin/node_exporter -ADD https://raw.githubusercontent.com/prometheus/node_exporter/v1.3.1/LICENSE \ - /licenses/LICENSE - -EXPOSE 9100 -USER nobody -ENTRYPOINT [ "/bin/node_exporter" ] diff --git a/node-exporter/v1.3.1/Makefile b/node-exporter/v1.3.1/Makefile deleted file mode 100644 index cc9b93d..0000000 --- a/node-exporter/v1.3.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t node-exporter:v1.3.1-ubi diff --git a/opentelemetry-collector-contrib/0.64.1/Dockerfile b/opentelemetry-collector-contrib/0.64.1/Dockerfile deleted file mode 100644 index c103476..0000000 --- a/opentelemetry-collector-contrib/0.64.1/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/open-telemetry/opentelemetry-collector-releases/blob/v0.64.1/distributions/otelcol-contrib/Dockerfile - -FROM otel/opentelemetry-collector-contrib:0.64.1 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.8 - -ARG USER_UID=10001 -USER ${USER_UID} - -WORKDIR / -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /etc/otelcol-contrib/config.yaml /etc/otelcol-contrib/config.yaml -COPY --from=builder /otelcol-contrib . - -ENV SUMMARY="UBI based opentelemetry-collector-contrib" \ - DESCRIPTION="OpenTelemetry Collector - otelcol-contrib distribution" - -LABEL name="opentelemetry-collector-contrib" \ - vendor="Sumo Logic" \ - version="0.64.1" \ - release="1" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/v0.64.1/LICENSE \ - /licenses/LICENSE - -ENTRYPOINT ["/otelcol-contrib"] -CMD ["--config", "/etc/otelcol-contrib/config.yaml"] -EXPOSE 4317 55678 55679 diff --git a/opentelemetry-collector-contrib/0.64.1/Makefile b/opentelemetry-collector-contrib/0.64.1/Makefile deleted file mode 100644 index c821d86..0000000 --- a/opentelemetry-collector-contrib/0.64.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t opentelemetry-collector-contrib:0.64.1 diff --git a/opentelemetry-collector/0.22.0-sumo/Dockerfile b/opentelemetry-collector/0.22.0-sumo/Dockerfile deleted file mode 100644 index 02f6dea..0000000 --- a/opentelemetry-collector/0.22.0-sumo/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/opentelemetry-collector-contrib/blob/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/cmd/otelcontribcol/Dockerfile -FROM public.ecr.aws/sumologic/opentelemetry-collector:0.22.0-sumo as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 - -LABEL name="Opentelemetry-collector" \ - vendor="Sumo Logic" \ - version="0.22.0-sumo" \ - release="1" \ - summary="UBI based opentelemetry-collector" \ - description="The OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data." \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/SumoLogic/opentelemetry-collector-contrib/5fd8754cbf0b9d88309cba2c9fee4a5342f3ed95/LICENSE \ - /licenses/LICENSE - -ARG USER_UID=10001 -USER ${USER_UID} - -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /otelcontribcol /otelcontribcol -EXPOSE 55680 55679 -ENTRYPOINT ["/otelcontribcol"] -CMD ["--config", "/etc/otel/config.yaml"] diff --git a/opentelemetry-collector/0.22.0-sumo/Makefile b/opentelemetry-collector/0.22.0-sumo/Makefile deleted file mode 100644 index 2774be4..0000000 --- a/opentelemetry-collector/0.22.0-sumo/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t opentelemetry-collector:0.22.0-sumo-ubi diff --git a/opentelemetry-operator/0.51.0/Dockerfile b/opentelemetry-operator/0.51.0/Dockerfile deleted file mode 100644 index eb511ff..0000000 --- a/opentelemetry-operator/0.51.0/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/open-telemetry/opentelemetry-operator/blob/v0.51.0/Dockerfile - -FROM ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.51.0 as builder - - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -WORKDIR / -COPY --from=builder /manager . - -ENV SUMMARY="UBI based opentelemetry operator" \ - DESCRIPTION="OpenTelemetry Operator manages OpenTelemetry Collector and auto-instrumentation of the workloads using OpenTelemetry instrumentation libraries" - -LABEL name="opentelemetry-operator" \ - vendor="Sumo Logic" \ - version="0.51.0" \ - release="1" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v0.51.0/LICENSE \ - /licenses/LICENSE - -USER 65532:65532 - -ENTRYPOINT ["/manager"] diff --git a/opentelemetry-operator/0.51.0/Makefile b/opentelemetry-operator/0.51.0/Makefile deleted file mode 100644 index 53aef92..0000000 --- a/opentelemetry-operator/0.51.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t opentelemetry-operator:0.51.0 diff --git a/opentelemetry-operator/0.63.1/Dockerfile b/opentelemetry-operator/0.63.1/Dockerfile deleted file mode 100644 index 33ad2a1..0000000 --- a/opentelemetry-operator/0.63.1/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/open-telemetry/opentelemetry-operator/blob/v0.63.1/Dockerfile - -FROM ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.63.1 as builder - - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.8 - -WORKDIR / -COPY --from=builder /manager . - -ENV SUMMARY="UBI based opentelemetry operator" \ - DESCRIPTION="OpenTelemetry Operator manages OpenTelemetry Collector and auto-instrumentation of the workloads using OpenTelemetry instrumentation libraries" - -LABEL name="opentelemetry-operator" \ - vendor="Sumo Logic" \ - version="0.63.1" \ - release="1" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/v0.63.1/LICENSE \ - /licenses/LICENSE - -USER 65532:65532 - -ENTRYPOINT ["/manager"] diff --git a/opentelemetry-operator/0.63.1/Makefile b/opentelemetry-operator/0.63.1/Makefile deleted file mode 100644 index 3bd8db3..0000000 --- a/opentelemetry-operator/0.63.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t opentelemetry-operator:0.63.1 diff --git a/opentelemetry-operator/Dockerfile b/opentelemetry-operator/Dockerfile index 5931ec9..533b563 100644 --- a/opentelemetry-operator/Dockerfile +++ b/opentelemetry-operator/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/open-telemetry/opentelemetry-operator/blob/v0.63.1/Dockerfile FROM public.ecr.aws/sumologic/opentelemetry-operator:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/opentelemetry-operator/Makefile b/opentelemetry-operator/Makefile index 69d14a4..ee18329 100644 --- a/opentelemetry-operator/Makefile +++ b/opentelemetry-operator/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "" -IMAGE_NAME := "opentelemetry-operator" include ../Makefile.common diff --git a/prometheus-config-reloader/Dockerfile b/prometheus-config-reloader/Dockerfile index 2d35bce..0c6782f 100644 --- a/prometheus-config-reloader/Dockerfile +++ b/prometheus-config-reloader/Dockerfile @@ -1,11 +1,10 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/v${UPSTREAM_VERSION}/cmd/prometheus-config-reloader/Dockerfile FROM public.ecr.aws/sumologic/prometheus-config-reloader:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/prometheus-config-reloader/Makefile b/prometheus-config-reloader/Makefile index 717fa92..371919b 100755 --- a/prometheus-config-reloader/Makefile +++ b/prometheus-config-reloader/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "prometheus-config-reloader" include ../Makefile.common diff --git a/prometheus-config-reloader/v0.43.2/Dockerfile b/prometheus-config-reloader/v0.43.2/Dockerfile deleted file mode 100644 index 917257f..0000000 --- a/prometheus-config-reloader/v0.43.2/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus-operator/prometheus-operator/blob/b86ab77239f2a11ee69ad05b24122958d8b2df5b/cmd/prometheus-config-reloader/Dockerfile -FROM quay.io/prometheus-operator/prometheus-config-reloader:v0.43.2 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Prometheus-config-reloader" \ - vendor="Sumo Logic" \ - version="0.43.2" \ - release="1" \ - summary="UBI based prometheus-config-reloader" \ - description="Prometheus configuration reloader" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/prometheus-config-reloader \ - /bin/prometheus-config-reloader -ADD https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/b86ab77239f2a11ee69ad05b24122958d8b2df5b/LICENSE \ - /licenses/LICENSE - -USER nobody - -ENTRYPOINT ["/bin/prometheus-config-reloader"] diff --git a/prometheus-config-reloader/v0.43.2/Makefile b/prometheus-config-reloader/v0.43.2/Makefile deleted file mode 100644 index 94b23bf..0000000 --- a/prometheus-config-reloader/v0.43.2/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t prometheus-config-reloader:v0.43.2-ubi diff --git a/prometheus-config-reloader/v0.44.0/Dockerfile b/prometheus-config-reloader/v0.44.0/Dockerfile deleted file mode 100644 index f68fc6b..0000000 --- a/prometheus-config-reloader/v0.44.0/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus-operator/prometheus-operator/blob/v0.44.0/cmd/prometheus-config-reloader/Dockerfile -FROM quay.io/prometheus-operator/prometheus-config-reloader:v0.44.0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based prometheus-config-reloader" \ - DESCRIPTION="Prometheus configuration reloader" - -LABEL name="Prometheus-config-reloader" \ - vendor="Sumo Logic" \ - version="0.44.0" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/prometheus-config-reloader \ - /bin/prometheus-config-reloader -ADD https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.44.0/LICENSE \ - /licenses/LICENSE - -USER nobody - -ENTRYPOINT ["/bin/prometheus-config-reloader"] diff --git a/prometheus-config-reloader/v0.44.0/Makefile b/prometheus-config-reloader/v0.44.0/Makefile deleted file mode 100644 index dcbb5ee..0000000 --- a/prometheus-config-reloader/v0.44.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t prometheus-config-reloader:v0.44.0-ubi diff --git a/prometheus-operator/Dockerfile b/prometheus-operator/Dockerfile index bc8d367..7626506 100644 --- a/prometheus-operator/Dockerfile +++ b/prometheus-operator/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/v${UPSTREAM_VERSION}/Dockerfile FROM public.ecr.aws/sumologic/prometheus-operator:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/prometheus-operator/Makefile b/prometheus-operator/Makefile index 6110aa8..371919b 100755 --- a/prometheus-operator/Makefile +++ b/prometheus-operator/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "prometheus-operator" include ../Makefile.common diff --git a/prometheus-operator/v0.43.2/Dockerfile b/prometheus-operator/v0.43.2/Dockerfile deleted file mode 100644 index cdc014a..0000000 --- a/prometheus-operator/v0.43.2/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus-operator/prometheus-operator/blob/b86ab77239f2a11ee69ad05b24122958d8b2df5b/Dockerfile -FROM quay.io/prometheus-operator/prometheus-operator:v0.43.2 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Prometheus-operator" \ - vendor="Sumo Logic" \ - version="0.43.2" \ - release="1" \ - summary="UBI based prometheus-operator" \ - description="The Prometheus Operator provides Kubernetes native deployment and management of Prometheus and related monitoring components." \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/operator \ - /bin/operator -ADD https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/b86ab77239f2a11ee69ad05b24122958d8b2df5b/LICENSE \ - /licenses/LICENSE - -# On busybox 'nobody' has uid `65534' -USER 65534 - -ENTRYPOINT ["/bin/operator"] diff --git a/prometheus-operator/v0.43.2/Makefile b/prometheus-operator/v0.43.2/Makefile deleted file mode 100644 index e92cd09..0000000 --- a/prometheus-operator/v0.43.2/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t prometheus-operator:v0.43.2-ubi diff --git a/prometheus-operator/v0.44.0/Dockerfile b/prometheus-operator/v0.44.0/Dockerfile deleted file mode 100644 index 33bca12..0000000 --- a/prometheus-operator/v0.44.0/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus-operator/prometheus-operator/blob/v0.44.0/Dockerfile -FROM quay.io/prometheus-operator/prometheus-operator:v0.44.0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based prometheus-operator" \ - DESCRIPTION="The Prometheus Operator provides Kubernetes native deployment and management of Prometheus and related monitoring components." - -LABEL name="Prometheus-operator" \ - vendor="Sumo Logic" \ - version="0.44.0" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/operator \ - /bin/operator -ADD https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.44.0/LICENSE \ - /licenses/LICENSE - -# On busybox 'nobody' has uid `65534' -USER 65534 - -ENTRYPOINT ["/bin/operator"] diff --git a/prometheus-operator/v0.44.0/Makefile b/prometheus-operator/v0.44.0/Makefile deleted file mode 100644 index aba46a1..0000000 --- a/prometheus-operator/v0.44.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t prometheus-operator:v0.44.0-ubi diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile index 2b8401c..990f084 100644 --- a/prometheus/Dockerfile +++ b/prometheus/Dockerfile @@ -1,5 +1,4 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/prometheus/prometheus/blob/00f16d1ac3a4c94561e5133b821d8e4d9ef78ec2/Dockerfile FROM public.ecr.aws/sumologic/prometheus:v${UPSTREAM_VERSION} as builder @@ -7,7 +6,7 @@ FROM public.ecr.aws/sumologic/prometheus:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image ARG ARCH="amd64" ARG OS="linux" -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/prometheus/Makefile b/prometheus/Makefile index cd0eca1..371919b 100644 --- a/prometheus/Makefile +++ b/prometheus/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "prometheus" include ../Makefile.common diff --git a/prometheus/v2.22.1/Dockerfile b/prometheus/v2.22.1/Dockerfile deleted file mode 100644 index cf11d5d..0000000 --- a/prometheus/v2.22.1/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/prometheus/prometheus/blob/00f16d1ac3a4c94561e5133b821d8e4d9ef78ec2/Dockerfile -FROM quay.io/prometheus/prometheus:v2.22.1 as builder - -## Build RedHat compliant image -ARG ARCH="amd64" -ARG OS="linux" -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based prometheus" \ - DESCRIPTION="Prometheus, a Cloud Native Computing Foundation project, is a systems and service monitoring system." - -LABEL name="Prometheus" \ - vendor="Sumo Logic" \ - version="2.22.1" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ARG ARCH="amd64" -ARG OS="linux" -COPY --from=builder /bin/prometheus /bin/prometheus -COPY --from=builder /bin/promtool /bin/promtool -COPY --from=builder /etc/prometheus/prometheus.yml /etc/prometheus/prometheus.yml -COPY --from=builder /usr/share/prometheus/console_libraries/ /usr/share/prometheus/console_libraries/ -COPY --from=builder /usr/share/prometheus/consoles/ /usr/share/prometheus/consoles/ -COPY --from=builder /LICENSE /licenses/LICENSE -COPY --from=builder /NOTICE /NOTICE -COPY --from=builder /npm_licenses.tar.bz2 /npm_licenses.tar.bz2 - -RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/ -RUN mkdir -p /prometheus && \ - groupadd nogroup && \ - chown -R nobody:nogroup etc/prometheus /prometheus - -USER nobody -EXPOSE 9090 -VOLUME [ "/prometheus" ] -WORKDIR /prometheus -ENTRYPOINT [ "/bin/prometheus" ] -CMD [ "--config.file=/etc/prometheus/prometheus.yml", \ - "--storage.tsdb.path=/prometheus", \ - "--web.console.libraries=/usr/share/prometheus/console_libraries", \ - "--web.console.templates=/usr/share/prometheus/consoles" ] diff --git a/prometheus/v2.22.1/Makefile b/prometheus/v2.22.1/Makefile deleted file mode 100644 index f250c6d..0000000 --- a/prometheus/v2.22.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t prometheus:v2.22.1-ubi diff --git a/sumo-ubi-minimal/8.4/Makefile b/sumo-ubi-minimal/8.4/Makefile deleted file mode 100644 index 5aa659f..0000000 --- a/sumo-ubi-minimal/8.4/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -build: - docker build . -t sumo-ubi-minimal:8.4 - -push: - docker tag sumo-ubi-minimal:8.4 public.ecr.aws/sumologic/sumo-ubi-minimal:8.4 - docker push public.ecr.aws/sumologic/sumo-ubi-minimal:8.4 diff --git a/sumo-ubi-minimal/8.4/Dockerfile b/sumo-ubi-minimal/Dockerfile similarity index 54% rename from sumo-ubi-minimal/8.4/Dockerfile rename to sumo-ubi-minimal/Dockerfile index 954d554..876582c 100644 --- a/sumo-ubi-minimal/8.4/Dockerfile +++ b/sumo-ubi-minimal/Dockerfile @@ -1,12 +1,17 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 +ARG UPSTREAM_VERSION -LABEL name="sumo-ubi8-minimal" \ +FROM registry.access.redhat.com/ubi9/ubi-minimal:${UPSTREAM_VERSION} + +ARG UPSTREAM_VERSION +ARG RELEASE + +LABEL name="sumo-ubi9-minimal" \ vendor="Sumo Logic" \ - version="8.4" \ - release="1" \ + version="${UPSTREAM_VERSION}" \ + release="${RELEASE}" \ summary="Provides the latest release of the minimal Red Hat Universal Base Image 8 prepared by Sumo Logic." \ description="The Universal Base Image Minimal is a stripped down image that uses microdnf as a package manager." \ - maintainer="collection@sumologic.com" + maintainer="opensource-collection-team@sumologic.com" ADD https://www.apache.org/licenses/LICENSE-2.0.txt \ /licenses/LICENSE diff --git a/sumo-ubi-minimal/Makefile b/sumo-ubi-minimal/Makefile new file mode 100755 index 0000000..d6ae239 --- /dev/null +++ b/sumo-ubi-minimal/Makefile @@ -0,0 +1,3 @@ +#!/usr/bin/make -f + +include ../Makefile.common diff --git a/sumologic-kubernetes-setup/v3.0.0/Dockerfile b/sumologic-kubernetes-setup/v3.0.0/Dockerfile deleted file mode 100644 index 47e5dc6..0000000 --- a/sumologic-kubernetes-setup/v3.0.0/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -### Required Labels ##### -LABEL name="SumoLogic Kubernetes Setup" \ - vendor="Sumo Logic" \ - version="3.0.0" \ - release="1" \ - summary="SumoLogic k8s setup job image" \ - description="This image is used to setup the kubernetes cluster and SumoLogic environment before installing SumoLogic collection helm chart" \ - maintainer="collection@sumologic.com" - -### Required End User Agreements ### -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-setup/9847c7ccbda1b5f98f603dc181f7f79c22311c82/LICENSE \ - /licenses/LICENSE - -ENV TERRAFORM_VERSION=0.13.7 -ARG TARGETPLATFORM - -RUN yum update -y \ - && yum install unzip -y \ - && yum clean all \ - && if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then TERRAFORM_PLATFORM="linux_amd64"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then TERRAFORM_PLATFORM="linux_arm"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then TERRAFORM_PLATFORM="linux_arm64"; fi; \ - if [ "${TERRAFORM_PLATFORM}" = "" ]; then TERRAFORM_PLATFORM="${TARGETPLATFORM}"; fi \ - && curl -o terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${TERRAFORM_PLATFORM}.zip \ - && unzip terraform.zip \ - && mv terraform /usr/local/bin/ \ - && rm terraform.zip \ - && groupdel input \ - && userdel systemd-coredump \ - && groupadd -g 999 setup \ - && useradd -u 999 -g setup setup \ - && mkdir /terraform /scripts \ - && chown -R setup:setup /terraform /scripts - -USER setup -RUN cd /terraform/ \ - && curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/7aeb5014aad04c21a21fea2d88e35600da6818eb/deploy/helm/sumologic/conf/setup/main.tf \ - && terraform init \ - && rm main.tf - -ARG BUILD_TAG=latest -ENV TAG=$BUILD_TAG - -WORKDIR /terraform/ diff --git a/sumologic-kubernetes-setup/v3.0.0/Makefile b/sumologic-kubernetes-setup/v3.0.0/Makefile deleted file mode 100644 index c22471b..0000000 --- a/sumologic-kubernetes-setup/v3.0.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t sumologic-kubernetes-setup:v3.0.0-ubi diff --git a/sumologic-kubernetes-setup/v3.3.0/Dockerfile b/sumologic-kubernetes-setup/v3.3.0/Dockerfile deleted file mode 100644 index abbb877..0000000 --- a/sumologic-kubernetes-setup/v3.3.0/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="SumoLogic k8s setup job image" \ - DESCRIPTION="This image is used to setup the kubernetes cluster and SumoLogic environment before installing SumoLogic collection helm chart" -### Required Labels ##### -LABEL name="SumoLogic Kubernetes Setup" \ - vendor="Sumo Logic" \ - version="3.3.0" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -### Required End User Agreements ### -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-setup/v3.3.0/LICENSE \ - /licenses/LICENSE - -## Original image ref: https://github.com/SumoLogic/sumologic-kubernetes-setup/blob/v3.3.0/Dockerfile -ENV TERRAFORM_VERSION=1.1.4 -ENV COLLECTION_VERSION=v2.4.1 -ENV MONITORS_VERSION=v1.0.7 -ARG TARGETPLATFORM - -RUN yum update -y \ - && yum install unzip git -y \ - && yum clean all \ - && if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then TERRAFORM_PLATFORM="linux_amd64"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then TERRAFORM_PLATFORM="linux_arm"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then TERRAFORM_PLATFORM="linux_arm64"; fi; \ - if [ "${TERRAFORM_PLATFORM}" = "" ]; then TERRAFORM_PLATFORM="${TARGETPLATFORM}"; fi \ - && curl -o terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${TERRAFORM_PLATFORM}.zip \ - && unzip terraform.zip \ - && mv terraform /usr/local/bin/ \ - && rm terraform.zip \ - && groupdel input \ - && userdel systemd-coredump \ - && groupadd -g 999 setup \ - && useradd -u 999 -g setup setup \ - && mkdir /terraform /scripts /monitors \ - && chown -R setup:setup /terraform /scripts /monitors - -USER setup -RUN cd /terraform/ \ - && curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/${COLLECTION_VERSION}/deploy/helm/sumologic/conf/setup/main.tf \ - && terraform init \ - && rm main.tf -RUN cd /monitors/ \ - && git clone https://github.com/SumoLogic/terraform-sumologic-sumo-logic-monitor.git \ - && cd terraform-sumologic-sumo-logic-monitor \ - && git checkout ${MONITORS_VERSION} \ - && cd .. \ - && cp terraform-sumologic-sumo-logic-monitor/monitor_packages/kubernetes/* . \ - && rm -rf terraform-sumologic-sumo-logic-monitor - -ARG BUILD_TAG=latest -ENV TAG=$BUILD_TAG - -WORKDIR /terraform/ diff --git a/sumologic-kubernetes-setup/v3.3.0/Makefile b/sumologic-kubernetes-setup/v3.3.0/Makefile deleted file mode 100644 index 75105b0..0000000 --- a/sumologic-kubernetes-setup/v3.3.0/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -BUILD_TAG ?= 3.3.0-ubi -IMAGE_NAME = kubernetes-setup - -build: - DOCKER_BUILDKIT=1 docker build \ - --load \ - --build-arg BUILD_TAG=$(BUILD_TAG) \ - --tag $(IMAGE_NAME):$(BUILD_TAG) \ - . diff --git a/sumologic-kubernetes-setup/v3.4.0/Dockerfile b/sumologic-kubernetes-setup/v3.4.0/Dockerfile deleted file mode 100644 index 9f30498..0000000 --- a/sumologic-kubernetes-setup/v3.4.0/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -FROM registry.access.redhat.com/ubi8/ubi:8.8 - -ENV SUMMARY="SumoLogic k8s setup job image" \ - DESCRIPTION="This image is used to setup the kubernetes cluster and SumoLogic environment before installing SumoLogic collection helm chart" -### Required Labels ##### -LABEL name="SumoLogic Kubernetes Setup" \ - vendor="Sumo Logic" \ - version="3.4.0" \ - release="4" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -### Required End User Agreements ### -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-setup/v3.4.0/LICENSE \ - /licenses/LICENSE - -## Original image ref: https://github.com/SumoLogic/sumologic-kubernetes-setup/blob/v3.4.0/Dockerfile -ENV TERRAFORM_VERSION=1.2.7 -ENV COLLECTION_VERSION=c251098963278e02c012cf8471d0b7a162efcb74 -ENV MONITORS_VERSION=v1.0.7 -ARG TARGETPLATFORM - -RUN yum update -y \ - && yum install unzip git jq -y \ - && yum clean all \ - && if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then TERRAFORM_PLATFORM="linux_amd64"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then TERRAFORM_PLATFORM="linux_arm"; fi; \ - if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then TERRAFORM_PLATFORM="linux_arm64"; fi; \ - if [ "${TERRAFORM_PLATFORM}" = "" ]; then TERRAFORM_PLATFORM="${TARGETPLATFORM}"; fi \ - && curl -o terraform.zip https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_${TERRAFORM_PLATFORM}.zip \ - && unzip terraform.zip \ - && mv terraform /usr/local/bin/ \ - && rm terraform.zip \ - && groupdel input \ - && userdel systemd-coredump \ - && groupadd -g 999 setup \ - && useradd -u 999 -g setup setup \ - && mkdir /terraform /scripts /monitors \ - && chown -R setup:setup /terraform /scripts /monitors - -USER setup -RUN cd /terraform/ \ - && curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/${COLLECTION_VERSION}/deploy/helm/sumologic/conf/setup/main.tf \ - && terraform init \ - && rm main.tf -RUN cd /monitors/ \ - && git clone https://github.com/SumoLogic/terraform-sumologic-sumo-logic-monitor.git \ - && cd terraform-sumologic-sumo-logic-monitor \ - && git checkout ${MONITORS_VERSION} \ - && cd .. \ - && cp terraform-sumologic-sumo-logic-monitor/monitor_packages/kubernetes/* . \ - && rm -rf terraform-sumologic-sumo-logic-monitor - -ARG BUILD_TAG=latest -ENV TAG=$BUILD_TAG - -WORKDIR /terraform/ diff --git a/sumologic-kubernetes-setup/v3.4.0/Makefile b/sumologic-kubernetes-setup/v3.4.0/Makefile deleted file mode 100644 index 800a6ee..0000000 --- a/sumologic-kubernetes-setup/v3.4.0/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -BUILD_TAG ?= 3.4.0-ubi-2 -IMAGE_NAME = kubernetes-setup - -build: - DOCKER_BUILDKIT=1 docker build \ - --load \ - --build-arg BUILD_TAG=$(BUILD_TAG) \ - --tag $(IMAGE_NAME):$(BUILD_TAG) \ - . diff --git a/sumologic-otel-collector/0.54.0-sumo-0/Dockerfile b/sumologic-otel-collector/0.54.0-sumo-0/Dockerfile deleted file mode 100644 index 6c934d3..0000000 --- a/sumologic-otel-collector/0.54.0-sumo-0/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/sumologic-otel-collector/blob/v0.54.0-sumo-0/Dockerfile -FROM public.ecr.aws/sumologic/sumologic-otel-collector:0.54.0-sumo-0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 - -ENV SUMMARY="UBI based sumologic-otel-collector" \ - DESCRIPTION="Sumo Logic Distribution for OpenTelemetry Collector is a Sumo Logic-supported distribution of the OpenTelemetry Collector. It is a single agent to send logs, metrics and traces to Sumo Logic." - -LABEL name="sumologic-otel-collector" \ - vendor="Sumo Logic" \ - version="0.54.0-sumo" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://github.com/SumoLogic/sumologic-otel-collector/blob/v0.54.0-sumo-0/LICENSE \ - /licenses/LICENSE - -ARG USER_UID=10001 -USER ${USER_UID} -ENV HOME /etc/otel/ - -# copy journalctl and it's dependencies as base structure -COPY --from=builder / / -COPY --from=builder --chown=${USER_UID}:${USER_UID} /etc/otel/ /etc/otel/ -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /otelcol-sumo /otelcol-sumo -ENTRYPOINT ["/otelcol-sumo"] -CMD ["--config", "/etc/otel/config.yaml"] diff --git a/sumologic-otel-collector/0.54.0-sumo-0/Makefile b/sumologic-otel-collector/0.54.0-sumo-0/Makefile deleted file mode 100644 index 4eb663f..0000000 --- a/sumologic-otel-collector/0.54.0-sumo-0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t sumologic-otel-collector:0.54.0-sumo-0-ubi diff --git a/sumologic-otel-collector/0.56.0-sumo-0/Dockerfile b/sumologic-otel-collector/0.56.0-sumo-0/Dockerfile deleted file mode 100644 index b49d84a..0000000 --- a/sumologic-otel-collector/0.56.0-sumo-0/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/sumologic-otel-collector/blob/v0.56.0-sumo-0/Dockerfile -FROM public.ecr.aws/sumologic/sumologic-otel-collector:0.56.0-sumo-0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 - -ENV SUMMARY="UBI based sumologic-otel-collector" \ - DESCRIPTION="Sumo Logic Distribution for OpenTelemetry Collector is a Sumo Logic-supported distribution of the OpenTelemetry Collector. It is a single agent to send logs, metrics and traces to Sumo Logic." - -LABEL name="sumologic-otel-collector" \ - vendor="Sumo Logic" \ - version="0.56.0-sumo" \ - release="3" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://github.com/SumoLogic/sumologic-otel-collector/blob/v0.56.0-sumo-0/LICENSE \ - /licenses/LICENSE - -ARG USER_UID=10001 -USER ${USER_UID} -ENV HOME /etc/otel/ - -# copy journalctl and it's dependencies as base structure -COPY --from=builder / / -COPY --from=builder --chown=${USER_UID}:${USER_UID} /etc/otel/ /etc/otel/ -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /otelcol-sumo /otelcol-sumo -ENTRYPOINT ["/otelcol-sumo"] -CMD ["--config", "/etc/otel/config.yaml"] diff --git a/sumologic-otel-collector/0.56.0-sumo-0/Makefile b/sumologic-otel-collector/0.56.0-sumo-0/Makefile deleted file mode 100644 index 46a2822..0000000 --- a/sumologic-otel-collector/0.56.0-sumo-0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t sumologic-otel-collector:0.56.0-sumo-0-ubi diff --git a/sumologic-otel-collector/0.57.2-sumo-1/Dockerfile b/sumologic-otel-collector/0.57.2-sumo-1/Dockerfile deleted file mode 100644 index 07fc5c6..0000000 --- a/sumologic-otel-collector/0.57.2-sumo-1/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/SumoLogic/sumologic-otel-collector/blob/v0.57.2-sumo-1/Dockerfile -FROM public.ecr.aws/sumologic/sumologic-otel-collector:0.57.2-sumo-1 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 - -ENV SUMMARY="UBI based sumologic-otel-collector" \ - DESCRIPTION="Sumo Logic Distribution for OpenTelemetry Collector is a Sumo Logic-supported distribution of the OpenTelemetry Collector. It is a single agent to send logs, metrics and traces to Sumo Logic." - -LABEL name="sumologic-otel-collector" \ - vendor="Sumo Logic" \ - version="0.57.2-sumo-1" \ - release="4" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -ADD https://raw.githubusercontent.com/SumoLogic/sumologic-otel-collector/v0.57.2-sumo-1/LICENSE \ - /licenses/LICENSE - -ARG USER_UID=10001 -USER ${USER_UID} -ENV HOME /etc/otel/ - -# copy journalctl and it's dependencies as base structure -COPY --from=builder / / -COPY --from=builder --chown=${USER_UID}:${USER_UID} /etc/otel/ /etc/otel/ -COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=builder /otelcol-sumo /otelcol-sumo -ENTRYPOINT ["/otelcol-sumo"] -CMD ["--config", "/etc/otel/config.yaml"] diff --git a/sumologic-otel-collector/0.57.2-sumo-1/Makefile b/sumologic-otel-collector/0.57.2-sumo-1/Makefile deleted file mode 100644 index ec0ae8d..0000000 --- a/sumologic-otel-collector/0.57.2-sumo-1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t sumologic-otel-collector:0.57.2-sumo-1-ubi diff --git a/telegraf-operator/Dockerfile b/telegraf-operator/Dockerfile index 8a02a6c..78b7c25 100644 --- a/telegraf-operator/Dockerfile +++ b/telegraf-operator/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/influxdata/telegraf-operator/blob/v1.3.10/Dockerfile FROM public.ecr.aws/sumologic/telegraf-operator:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/telegraf-operator/Makefile b/telegraf-operator/Makefile index 2d19f0a..371919b 100644 --- a/telegraf-operator/Makefile +++ b/telegraf-operator/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "telegraf-operator" include ../Makefile.common diff --git a/telegraf-operator/v1.1.1/Dockerfile b/telegraf-operator/v1.1.1/Dockerfile deleted file mode 100644 index cbbfd3f..0000000 --- a/telegraf-operator/v1.1.1/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/influxdata/telegraf-operator/blob/v1.1.1/Dockerfile -FROM quay.io/influxdb/telegraf-operator:v1.1.1 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest - -LABEL name="telegraf-operator" \ - vendor="Sumo Logic" \ - version="1.1.1" \ - release="1" \ - summary="UBI based telegraf-operator" \ - description="The telegraf facilitates management of telegraf CRDs in Kubernetes." \ - maintainer="collection@sumologic.com" - -WORKDIR / -COPY --from=builder /manager . - -ADD https://raw.githubusercontent.com/influxdata/telegraf-operator/79b6434e7a3655f9f65d9552d2c420a54026323d/LICENSE \ - /licenses/LICENSE - -ENTRYPOINT ["/manager"] diff --git a/telegraf-operator/v1.1.1/Makefile b/telegraf-operator/v1.1.1/Makefile deleted file mode 100644 index 9d312aa..0000000 --- a/telegraf-operator/v1.1.1/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t telegraf-operator:v1.1.1-ubi diff --git a/telegraf-operator/v1.3.10/Dockerfile b/telegraf-operator/v1.3.10/Dockerfile deleted file mode 100644 index 23b8731..0000000 --- a/telegraf-operator/v1.3.10/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/influxdata/telegraf-operator/blob/v1.3.10/Dockerfile -FROM quay.io/influxdb/telegraf-operator:v1.3.10 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8-minimal:8.8 - -ENV SUMMARY="UBI based telegraf-operator" \ - DESCRIPTION="The telegraf facilitates management of telegraf CRDs in Kubernetes." - -LABEL name="telegraf-operator" \ - vendor="Sumo Logic" \ - version="1.3.10" \ - release="1" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -WORKDIR / -COPY --from=builder /manager . - -ADD https://raw.githubusercontent.com/influxdata/telegraf-operator/v1.3.10/LICENSE \ - /licenses/LICENSE - -USER nobody -ENTRYPOINT ["/manager"] diff --git a/telegraf-operator/v1.3.10/Makefile b/telegraf-operator/v1.3.10/Makefile deleted file mode 100644 index 8b37aa1..0000000 --- a/telegraf-operator/v1.3.10/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t telegraf-operator-ubi:v1.3.10 diff --git a/telegraf-operator/v1.3.5/Dockerfile b/telegraf-operator/v1.3.5/Dockerfile deleted file mode 100644 index d6796cf..0000000 --- a/telegraf-operator/v1.3.5/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/influxdata/telegraf-operator/blob/v1.3.5/Dockerfile -FROM quay.io/influxdb/telegraf-operator:v1.3.5 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 - -ENV SUMMARY="UBI based telegraf-operator" \ - DESCRIPTION="The telegraf facilitates management of telegraf CRDs in Kubernetes." - -LABEL name="telegraf-operator" \ - vendor="Sumo Logic" \ - version="1.3.5" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -WORKDIR / -COPY --from=builder /manager . - -ADD https://raw.githubusercontent.com/influxdata/telegraf-operator/v1.3.5/LICENSE \ - /licenses/LICENSE - -USER nobody -ENTRYPOINT ["/manager"] diff --git a/telegraf-operator/v1.3.5/Makefile b/telegraf-operator/v1.3.5/Makefile deleted file mode 100644 index 35ac5f5..0000000 --- a/telegraf-operator/v1.3.5/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t telegraf-operator-ubi:v1.3.5 diff --git a/telegraf/1.14.4/Dockerfile b/telegraf/1.14.4/Dockerfile deleted file mode 100644 index 4985a17..0000000 --- a/telegraf/1.14.4/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/influxdata/influxdata-docker/blob/1d3c13915c892a46bca5da3e3369b8620be6df80/telegraf/1.14/Dockerfile -FROM telegraf:1.14.4 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 - -LABEL name="telegraf" \ - vendor="Sumo Logic" \ - version="1.14.4" \ - release="1" \ - summary="UBI based telegraf" \ - description="Telegraf is an agent for collecting metrics and writing them to InfluxDB or other outputs." \ - maintainer="collection@sumologic.com" - -COPY --from=builder /usr/bin/telegraf \ - /usr/bin/telegraf -COPY --from=builder /etc/telegraf/telegraf.conf \ - /etc/telegraf/telegraf.conf -# copy ca-cerificates -COPY --from=builder /etc/ssl/certs/ca-certificates.crt \ - /etc/ssl/certs - -ADD https://raw.githubusercontent.com/influxdata/influxdata-docker/1d3c13915c892a46bca5da3e3369b8620be6df80/telegraf/LICENSE \ - /licenses/LICENSE - -EXPOSE 8125/udp 8092/udp 8094 - -COPY --from=builder /entrypoint.sh /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] -CMD ["telegraf"] diff --git a/telegraf/1.14.4/LICENSE b/telegraf/1.14.4/LICENSE deleted file mode 100644 index c2419d2..0000000 --- a/telegraf/1.14.4/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Influxdata.inc - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/telegraf/1.14.4/Makefile b/telegraf/1.14.4/Makefile deleted file mode 100644 index 726bbd3..0000000 --- a/telegraf/1.14.4/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t telegraf:1.14.4-ubi diff --git a/telegraf/1.21.2/Dockerfile b/telegraf/1.21.2/Dockerfile deleted file mode 100644 index 426c380..0000000 --- a/telegraf/1.21.2/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/influxdata/influxdata-docker/blob/dd108978ea0e5c0e99ebc745c03973c755702680/telegraf/1.21/Dockerfile -FROM telegraf:1.21.2 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6 - -ENV SUMMARY="UBI based telegraf" \ - DESCRIPTION="Telegraf is an agent for collecting metrics and writing them to InfluxDB or other outputs." - -LABEL name="telegraf" \ - vendor="Sumo Logic" \ - version="1.21.2" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder /usr/bin/telegraf \ - /usr/bin/telegraf -COPY --from=builder /etc/telegraf/telegraf.conf \ - /etc/telegraf/telegraf.conf -# copy ca-cerificates -COPY --from=builder /etc/ssl/certs/ca-certificates.crt \ - /etc/ssl/certs - -ADD https://raw.githubusercontent.com/influxdata/influxdata-docker/dd108978ea0e5c0e99ebc745c03973c755702680/telegraf/LICENSE \ - /licenses/LICENSE - -EXPOSE 8125/udp 8092/udp 8094 - -COPY --from=builder /entrypoint.sh /entrypoint.sh -USER nobody -ENTRYPOINT ["/entrypoint.sh"] -CMD ["telegraf"] diff --git a/telegraf/1.21.2/LICENSE b/telegraf/1.21.2/LICENSE deleted file mode 100644 index c2419d2..0000000 --- a/telegraf/1.21.2/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Influxdata.inc - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/telegraf/1.21.2/Makefile b/telegraf/1.21.2/Makefile deleted file mode 100644 index 73bd6fe..0000000 --- a/telegraf/1.21.2/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t telegraf:1.21.2-ubi diff --git a/telegraf/Dockerfile b/telegraf/Dockerfile index 820d189..ad499e0 100644 --- a/telegraf/Dockerfile +++ b/telegraf/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.6 ## Use original image to copy files from ## ref: https://github.com/influxdata/influxdata-docker/blob/dd108978ea0e5c0e99ebc745c03973c755702680/telegraf/1.21/Dockerfile FROM public.ecr.aws/sumologic/telegraf:${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/telegraf/Makefile b/telegraf/Makefile index 7397797..d6ae239 100644 --- a/telegraf/Makefile +++ b/telegraf/Makefile @@ -1,6 +1,3 @@ #!/usr/bin/make -f -VERSION_PREFIX := "" -IMAGE_NAME := "telegraf" - include ../Makefile.common diff --git a/thanos/Dockerfile b/thanos/Dockerfile index bc5ca3d..8eb9671 100644 --- a/thanos/Dockerfile +++ b/thanos/Dockerfile @@ -1,12 +1,11 @@ ARG UPSTREAM_VERSION -ARG UBI_IMAGE=registry.access.redhat.com/ubi8/ubi:8.6 ## Use original image to copy files from ## ref: https://github.com/thanos-io/thanos/blob/v0.25.2/Dockerfile FROM public.ecr.aws/sumologic/thanos:v${UPSTREAM_VERSION} as builder ## Build RedHat compliant image -FROM ${UBI_IMAGE} +FROM registry.access.redhat.com/ubi9/ubi:9.4 ARG UPSTREAM_VERSION ARG RELEASE diff --git a/thanos/Makefile b/thanos/Makefile index c7602a0..371919b 100644 --- a/thanos/Makefile +++ b/thanos/Makefile @@ -1,6 +1,5 @@ #!/usr/bin/make -f VERSION_PREFIX := "v" -IMAGE_NAME := "thanos" include ../Makefile.common diff --git a/thanos/v0.10.0/Dockerfile b/thanos/v0.10.0/Dockerfile deleted file mode 100644 index 90f6045..0000000 --- a/thanos/v0.10.0/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/thanos-io/thanos/blob/698c7a922cd5dcaa53e305db5c2adb4e79d328ba/Dockerfile -FROM quay.io/thanos/thanos:v0.10.0 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.4 - -LABEL name="Thanos" \ - vendor="Sumo Logic" \ - version="0.10.0" \ - release="1" \ - summary="UBI based thanos" \ - description="Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/thanos \ - /bin/thanos -ADD https://raw.githubusercontent.com/thanos-io/thanos/698c7a922cd5dcaa53e305db5c2adb4e79d328ba/LICENSE \ - /licenses/LICENSE - -ENTRYPOINT [ "/bin/thanos" ] diff --git a/thanos/v0.10.0/Makefile b/thanos/v0.10.0/Makefile deleted file mode 100644 index a4c3ebf..0000000 --- a/thanos/v0.10.0/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t thanos:v0.10.0-ubi diff --git a/thanos/v0.25.2/Dockerfile b/thanos/v0.25.2/Dockerfile deleted file mode 100644 index d7bb27b..0000000 --- a/thanos/v0.25.2/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -## Use original image to copy files from -## ref: https://github.com/thanos-io/thanos/blob/v0.25.2/Dockerfile -FROM quay.io/thanos/thanos:v0.25.2 as builder - -## Build RedHat compliant image -FROM registry.access.redhat.com/ubi8/ubi:8.6 - -ENV SUMMARY="UBI based thanos" \ - DESCRIPTION="Thanos is a set of components that can be composed into a highly available metric system with unlimited storage capacity, which can be added seamlessly on top of existing Prometheus deployments." - -LABEL name="Thanos" \ - vendor="Sumo Logic" \ - version="0.25.2" \ - release="2" \ - summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - maintainer="collection@sumologic.com" - -COPY --from=builder \ - /bin/thanos \ - /bin/thanos -ADD https://raw.githubusercontent.com/thanos-io/thanos/v0.25.2/LICENSE \ - /licenses/LICENSE - -USER nobody - -ENTRYPOINT [ "/bin/thanos" ] diff --git a/thanos/v0.25.2/Makefile b/thanos/v0.25.2/Makefile deleted file mode 100644 index c7072c9..0000000 --- a/thanos/v0.25.2/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -build: - docker build . -t thanos:v0.25.2-ubi