From 13d31589291ba19926e8205487019be21d1a3966 Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Tue, 2 Jul 2024 15:35:46 +0300 Subject: [PATCH] make it possible to use rhel9-2-els image in Brew build Signed-off-by: Valeriy Svydenko --- .../build/dockerfiles/Dockerfile | 9 +++++++-- .../build/dockerfiles/content_sets_rhel9.repo | 13 +++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 dependencies/che-plugin-registry/build/dockerfiles/content_sets_rhel9.repo diff --git a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile index bc630278a8..9c2ea6879b 100644 --- a/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile +++ b/dependencies/che-plugin-registry/build/dockerfiles/Dockerfile @@ -13,6 +13,8 @@ # https://registry.access.redhat.com/rhel8/postgresql-15 FROM registry.redhat.io/rhel8/postgresql-15:1-50.1708914865 +# rhel9-2-els is used for the build in Brew +# FROM registry.redhat.io/rhel9-2-els/rhel:9.2-1222 USER 0 WORKDIR / @@ -42,6 +44,9 @@ COPY ./build/dockerfiles/content_set*.repo /etc/yum.repos.d/ COPY ./build/dockerfiles/rhel.install.sh /tmp RUN /tmp/rhel.install.sh && rm -f /tmp/rhel.install.sh +# Install postgresql and nodejs into rhel9-2-els +# RUN dnf module install postgresql:15/server nodejs:18/development -y + # Copy OpenVSX server files COPY --chown=0:0 /openvsx-server.tar.gz . RUN tar --no-same-owner -xf openvsx-server.tar.gz && rm openvsx-server.tar.gz @@ -135,8 +140,8 @@ RUN chmod 777 /var/run/postgresql && \ RUN \ echo "Change permissions for postgres user" && \ - chmod -R g+rwx /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \ - chgrp -R 0 /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \ + chmod -R g+rwx /var/lib/pgsql/15 /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \ + chgrp -R 0 /var/lib/pgsql/15 /var/lib/pgsql/15 /var/lib/pgsql/data /var/lib/pgsql/backups && \ mv /var/lib/pgsql/15/data/database /var/lib/pgsql/15/data/old ARG DS_BRANCH=devspaces-3-rhel-8 diff --git a/dependencies/che-plugin-registry/build/dockerfiles/content_sets_rhel9.repo b/dependencies/che-plugin-registry/build/dockerfiles/content_sets_rhel9.repo new file mode 100644 index 0000000000..ee220c271d --- /dev/null +++ b/dependencies/che-plugin-registry/build/dockerfiles/content_sets_rhel9.repo @@ -0,0 +1,13 @@ +[rhel-9-for-appstream-rpms-pulp] +name=rhel-9-for-appstream-rpms-pulp +baseurl=https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/appstream/os +enabled=0 +gpgcheck=0 +skip_if_unavailable=True + +[rhel-9-for-baseos-rpms-pulp] +name=rhel-9-for-baseos-rpms-pulp +baseurl=https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/$basearch/baseos/os +enabled=0 +gpgcheck=0 +skip_if_unavailable=True