Merge pull request #673 from redhat-marketplace/release/2.17.1

Release/2.17.1
redhat-marketplace · Sep 9, 2024 · 1d1d4ca · 1d1d4ca
2 parents 930acec + ed90862
commit 1d1d4ca
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 37 deletions.
diff --git a/airgap/v2/Dockerfile b/airgap/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM ${REGISTRY}/data-service-ubi-minimal:ubi8
+FROM ${REGISTRY}/data-service-ubi-minimal:ubi9
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect
 COPY --from=builder /opt/app-root/src/go/bin/grpc-health-probe /usr/local/bin/grpc-health-probe
 
 WORKDIR /usr/local/bin

diff --git a/authchecker/v2/Dockerfile b/authchecker/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect 
 
 WORKDIR /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

diff --git a/base/Makefile b/base/Makefile
@@ -7,8 +7,8 @@ include ../utils.Makefile
 
 IMAGE_REGISTRY ?= public-image-registry.apps-crc.testing/symposium
 REGISTRY ?= $(IMAGE_REGISTRY)
-DSIMG = $(IMAGE_REGISTRY)/data-service-base:ubi8
-DSUBIIMG = $(IMAGE_REGISTRY)/data-service-ubi-minimal:ubi8
+DSIMG = $(IMAGE_REGISTRY)/data-service-base:ubi9
+DSUBIIMG = $(IMAGE_REGISTRY)/data-service-ubi-minimal:ubi9
 ARGS = --no-cache --build-arg REGISTRY=$(IMAGE_REGISTRY)
 
 # Build the docker images

diff --git a/base/data-service-ubi-minimal.Dockerfile b/base/data-service-ubi-minimal.Dockerfile
@@ -1,20 +1,20 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 as dqlite-lib-builder
+FROM ${REGISTRY}/data-service-base:ubi9 as dqlite-lib-builder
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
 ARG quay_expiration=7d
 
 # microdnf can not install from url, must curl & rpm
-RUN curl -sSL -o epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
-    rpm -i epel-release-latest-8.noarch.rpm && \
-    microdnf install libsqlite3x libuv && \
+RUN curl -sSL -o epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+    rpm -i epel-release-latest-9.noarch.rpm && \
+    microdnf install -y libsqlite3x libuv && \
     microdnf clean all && \
-    rpm -e epel-release-8 && \
-    rm -Rf epel-release-latest-8.noarch.rpm
+    rpm -e epel-release-9 && \
+    rm -Rf epel-release-latest-9.noarch.rpm
 
 # COPY dqlite from builder
 COPY --from=dqlite-lib-builder /usr/lib64/libdqlite.* /usr/lib64/

diff --git a/base/dataservice.Dockerfile b/base/dataservice.Dockerfile
@@ -1,13 +1,12 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21
+FROM registry.access.redhat.com/ubi9/go-toolset:1.21
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
 ENV TZ=America/New_York
 ENV PATH=$PATH:/opt/app-root/src/go/bin CGO_ENABLED=1
 ARG GRPC_HEALTH_VERSION=v0.4.25
-ARG DQLITE_VERSION=v1.16.4
+ARG DQLITE_VERSION=v1.16.7
 ARG LIBUV_VERSION=v1.48.0
-ARG FIPS_DETECT_VERSION=7157dae
 ARG quay_expiration=7d
 
 USER 0
@@ -18,9 +17,9 @@ USER 0
 RUN mkdir -p /opt/app-root/src/go/bin && \
     mkdir -p /opt/app-root/src/go/pkg && \
     dnf update -y && \
-    dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
+    dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
     dnf install -y libsqlite3x-devel libtool pkgconf-pkg-config lz4 lz4-devel && \
-    dnf remove epel-release-latest-8 && \
+    dnf remove epel-release-latest-9 && \
     dnf clean all  && \
     git clone -b $LIBUV_VERSION -v https://github.com/libuv/libuv.git && \
     cd libuv && sh autogen.sh && ./configure --prefix=/usr --libdir=/usr/lib64 && make && make install && \
@@ -29,5 +28,4 @@ RUN mkdir -p /opt/app-root/src/go/bin && \
     cd dqlite && autoreconf -i && ./configure --enable-build-raft --prefix=/usr --libdir=/usr/lib64 && make && make install && \
     cd .. && rm -Rf dqlite && \
     go install github.com/grpc-ecosystem/grpc-health-probe@${GRPC_HEALTH_VERSION} && \
-    go install github.com/acardace/fips-detect@${FIPS_DETECT_VERSION} && \
     go clean -modcache
diff --git a/datareporter/v2/Dockerfile b/datareporter/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect 
 
 WORKDIR /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

diff --git a/hack/certify/certify.sh b/hack/certify/certify.sh
@@ -146,7 +146,7 @@ cd $TMP_DIR
 git clone https://github.com/redhat-openshift-ecosystem/operator-pipelines
 cd operator-pipelines
 
-git checkout v1.0.131
+git checkout v1.0.143
 
 # Create a new SCC
 oc apply -f ansible/roles/operator-pipeline/templates/openshift/openshift-pipelines-custom-scc.yml

diff --git a/metering/v2/Dockerfile b/metering/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect 
 
 WORKDIR /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

diff --git a/reporter/v2/Dockerfile b/reporter/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect 
 
 WORKDIR /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

diff --git a/v2/Dockerfile b/v2/Dockerfile
@@ -1,6 +1,6 @@
 ARG REGISTRY=quay.io/rh-marketplace
 
-FROM ${REGISTRY}/data-service-base:ubi8 AS builder
+FROM ${REGISTRY}/data-service-base:ubi9 AS builder
 ARG name
 ARG path
 ARG exec
@@ -20,7 +20,7 @@ RUN --mount=type=bind,source=.,target=/src \
     cd ${path} && \
     go build -o /opt/app-root/src/go/bin/${bin} ${exec}
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETOS
@@ -51,7 +51,6 @@ COPY v2/LICENSE v2/_licenses/* /licenses/
 RUN  /usr/local/bin/user_setup
 
 COPY --from=builder /opt/app-root/src/go/bin/${bin} /usr/local/bin/${bin}
-COPY --from=builder /opt/app-root/src/go/bin/fips-detect /usr/local/bin/fips-detect 
 
 WORKDIR /usr/local/bin
 ENTRYPOINT ["/usr/local/bin/entrypoint"]

diff --git a/v2/hack/docker/bin/entrypoint b/v2/hack/docker/bin/entrypoint
@@ -11,7 +11,6 @@ if ! whoami &>/dev/null; then
 fi
 
 if [[ ! -v "$BINFILE" ]]; then
-    fips-detect $BINFILE
     exec $BINFILE $@
 fi
 

diff --git a/v2/version/version.go b/v2/version/version.go
@@ -14,5 +14,5 @@
 
 package version
 
-const Version = "2.17.0"
-const LastVersion = "2.16.3"
+const Version = "2.17.1"
+const LastVersion = "2.17.0"
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ if ! whoami &>/dev/null; then @@
     fi
     if [[ ! -v "$BINFILE" ]]; then
-        fips-detect $BINFILE
         exec $BINFILE $@
     fi
@@ Expand Down @@