Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump up Xray version to 3.91.3 #378

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Bump up Xray version to 3.91.3 #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Openshift4/RedHatImages/Dockerfile.redhat-ubi-jfrog-rabbitmq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# JFROG REDHAT UBI PORT TO WORK IN BITNAMI RABBITMQ HELM CHARTS


FROM bitnami/rabbitmq:3.8.9-debian-10-r88 as base
FROM bitnami/rabbitmq:3.12.10-debian-11-r1 as base

FROM registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi9

ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'

Expand All @@ -15,7 +15,7 @@ LABEL name="JFrog Rabbit MQ" \
summary="JFrog Rabbit MQ (Red Hat UBI)" \
com.jfrog.license_terms="https://jfrog.com/platform/enterprise-plus-eula/"

ARG RABBITMQ_VERSION=3.8.9-debian-10-r88
ARG RABBITMQ_VERSION=3.12.10-debian-11-r1

LABEL io.k8s.description="Lightweight open source message broker" \
io.k8s.display-name="RabbitMQ" \
Expand All @@ -37,8 +37,8 @@ ENV GPG_KEY="0A9AF2115F4687BD29803A206B73A36E6026DFCA" \

RUN yum install -y --disableplugin=subscription-manager xz
RUN set -xe && \
curl -LO https://github.com/rabbitmq/erlang-rpm/releases/download/v23.0/erlang-23.0-1.el8.x86_64.rpm && \
rpm -Uvh ./erlang-23.0-1.el8.x86_64.rpm && \
curl -LO https://github.com/rabbitmq/erlang-rpm/releases/download/v25.0.3/erlang-25.0.3-1.el8.x86_64.rpm && \
yum --nogpgcheck localinstall -y --nobest --skip-broken ./erlang-25.0.3-1.el8.x86_64.rpm && \
rm *.rpm && \
INSTALL_PKGS="wget procps net-tools hostname" && \
yum install -y $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt-initcontainer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# The new image based on registry.access.redhat.com/ubi
FROM registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi9

USER root

Expand Down
2 changes: 1 addition & 1 deletion Openshift4/RedHatImages/Dockerfile.redhat-ubi-rt7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG ARTIFACTORY_BASE_VERSION
FROM docker.bintray.io/jfrog/artifactory-pro:${ARTIFACTORY_BASE_VERSION} AS base

# The new image based on registry.access.redhat.com/ubi
FROM registry.access.redhat.com/ubi8
FROM registry.access.redhat.com/ubi9

LABEL name="JFrog Artifactory Pro" \
description="JFrog Artifactory Pro image based on the Red Hat Universal Base Image." \
Expand Down
3 changes: 1 addition & 2 deletions Openshift4/RedHatImages/Dockerfile.redhat-ubi-xray-analysis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ ENV JF_XRAY_USER=xray \

COPY --from=base /opt/jfrog/xray /opt/jfrog/xray
COPY --from=base /var/opt/jfrog/xray /var/opt/jfrog/xray
COPY --from=base /postgresql-client /postgresql-client

# Add license information to meet the Red Hat container image certification requirements
COPY --from=base /opt/jfrog/xray/app/doc/* /licenses/

RUN mkdir -p /var/opt/jfrog && chmod 0777 /var/opt/jfrog

RUN useradd -M -s /usr/sbin/nologin --uid ${XRAY_USER_ID} --user-group ${JF_XRAY_USER} && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} /postgresql-client && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} && \
yum install -y --disableplugin=subscription-manager wget && \
yum install -y --disableplugin=subscription-manager procps && \
yum install -y --disableplugin=subscription-manager net-tools && \
Expand Down
3 changes: 1 addition & 2 deletions Openshift4/RedHatImages/Dockerfile.redhat-ubi-xray-indexer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ ENV JF_XRAY_USER=xray \

COPY --from=base /opt/jfrog/xray /opt/jfrog/xray
COPY --from=base /var/opt/jfrog/xray /var/opt/jfrog/xray
COPY --from=base /postgresql-client /postgresql-client

# Add license information to meet the Red Hat container image certification requirements
COPY --from=base /opt/jfrog/xray/app/doc/* /licenses/
Expand All @@ -30,7 +29,7 @@ RUN mkdir -p /var/opt/jfrog && chmod 0777 /var/opt/jfrog


RUN useradd -M -s /usr/sbin/nologin --uid ${XRAY_USER_ID} --user-group ${JF_XRAY_USER} && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} /postgresql-client && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} && \
yum install -y --disableplugin=subscription-manager wget && \
yum install -y --disableplugin=subscription-manager procps && \
yum install -y --disableplugin=subscription-manager net-tools && \
Expand Down
3 changes: 1 addition & 2 deletions Openshift4/RedHatImages/Dockerfile.redhat-ubi-xray-persist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ ENV JF_XRAY_USER=xray \

COPY --from=base /opt/jfrog/xray /opt/jfrog/xray
COPY --from=base /var/opt/jfrog/xray /var/opt/jfrog/xray
COPY --from=base /postgresql-client /postgresql-client

# Add license information to meet the Red Hat container image certification requirements
COPY --from=base /opt/jfrog/xray/app/doc/* /licenses/
Expand All @@ -30,7 +29,7 @@ RUN mkdir -p /var/opt/jfrog && chmod 0777 /var/opt/jfrog


RUN useradd -M -s /usr/sbin/nologin --uid ${XRAY_USER_ID} --user-group ${JF_XRAY_USER} && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} /postgresql-client && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} && \
yum install -y --disableplugin=subscription-manager wget && \
yum install -y --disableplugin=subscription-manager procps && \
yum install -y --disableplugin=subscription-manager net-tools && \
Expand Down
3 changes: 1 addition & 2 deletions Openshift4/RedHatImages/Dockerfile.redhat-ubi-xray-server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ ENV JF_XRAY_USER=xray \

COPY --from=base /opt/jfrog/xray /opt/jfrog/xray
COPY --from=base /var/opt/jfrog/xray /var/opt/jfrog/xray
COPY --from=base /postgresql-client /postgresql-client

# Add license information to meet the Red Hat container image certification requirements
COPY --from=base /opt/jfrog/xray/app/doc/* /licenses/
Expand All @@ -33,7 +32,7 @@ RUN mkdir -p /var/opt/jfrog && chmod 0777 /var/opt/jfrog


RUN useradd -M -s /usr/sbin/nologin --uid ${XRAY_USER_ID} --user-group ${JF_XRAY_USER} && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} /postgresql-client && \
chown -R ${JF_XRAY_USER}:${JF_XRAY_USER} ${JF_PRODUCT_HOME} ${JF_PRODUCT_DATA_INTERNAL} && \
yum install -y --disableplugin=subscription-manager wget && \
yum install -y --disableplugin=subscription-manager procps && \
yum install -y --disableplugin=subscription-manager net-tools && \
Expand Down
Loading
Loading