Skip to content

Add dist-gen #367

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

Open
pkhartsk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add dist-gen #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc21c7e
Add dist-gen source files for generated sources
pkhartsk Jul 13, 2026
0412400
Update distgen-generated files
pkhartsk Jul 14, 2026
31b4843
common submodule updated
pkhartsk Jul 28, 2026
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
24 changes: 16 additions & 8 deletions base/Dockerfile.c10s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,28 @@ images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=22 \
NAME=s2i-base
NAME=s2i-base \
VERSION=10

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, this is not needed at all. We do not use it. We were trying to remove it.


LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME-container" \
name="sclorg/$NAME-c10s" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base c10s" \
com.redhat.component="s2i-base-container" \
name="sclorg/s2i-base-c10s" \
version=10 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN INSTALL_PKGS="autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the
# application runtime execution.
# TODO: Use better UID and GID values

RUN \
INSTALL_PKGS="autoconf \
nodejs \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -44,8 +52,8 @@ RUN INSTALL_PKGS="autoconf \
unzip \
wget \
which \
zlib-ng-compat-devel" && \
zlib-devel" && \

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my point of view zlib-devel is bigger then zlib-ng-compat-devel. Am I right?

@pkhartsk pkhartsk Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least in rhel10/c10s they're linked to the same package

dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
#rpm -V $INSTALL_PKGS && \

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer to remove it at all.

node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
dnf -y clean all --enablerepo='*'
51 changes: 0 additions & 51 deletions base/Dockerfile.c8s
View file
Open in desktop

This file was deleted.

28 changes: 18 additions & 10 deletions base/Dockerfile.c9s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,29 @@ images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=22 \
NAME=s2i-base
NAME=s2i-base \
VERSION=9

LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME-container" \
name="sclorg/$NAME-c9s" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base c9s" \
com.redhat.component="s2i-base-container" \
name="sclorg/s2i-base-c9s" \
version=9 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN yum -y module enable nodejs:$NODEJS_VER && \
INSTALL_PKGS="nodejs autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't follow this comment. As far as I know this is not needed.

# application runtime execution.
# TODO: Use better UID and GID values

RUN \
dnf -y module enable nodejs:$NODEJS_VER && \
INSTALL_PKGS="autoconf \
nodejs \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -46,7 +54,7 @@ RUN yum -y module enable nodejs:$NODEJS_VER && \
wget \
which \
zlib-devel" && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
#rpm -V $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
yum -y clean all --enablerepo='*'
dnf -y clean all --enablerepo='*'
28 changes: 19 additions & 9 deletions base/Dockerfile.f38
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,29 @@
images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=18 \

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dockerfile.f38 reach already EOL. I don't think, that modification is needed. I would prefer to remove it.

NAME=s2i-base \
ARCH=x86_64
VERSION=38

LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME" \
name="fedora/$NAME" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base fedora38" \
com.redhat.component="s2i-base-container" \
name="fedora/s2i-base" \
version=38 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN INSTALL_PKGS="autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the
# application runtime execution.
# TODO: Use better UID and GID values

RUN \
INSTALL_PKGS="autoconf \
nodejs18 \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -35,15 +43,17 @@
lsof \
make \
mariadb-connector-c-devel \
nodejs-npm \
openssl-devel \
patch \
procps-ng \
nodejs18-npm \
redhat-rpm-config \
sqlite-devel \
unzip \
wget \
which \
zlib-devel" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf clean all -y
#rpm -V $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
dnf -y clean all --enablerepo='*'
28 changes: 19 additions & 9 deletions base/Dockerfile.f39
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,29 @@
images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=20 \

@phracek phracek Jul 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like for F39. It already reached EOL.

@pkhartsk pkhartsk Jul 28, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But from what I know the fedora images for pg15 use an older fedora so I didn't want to break any existing images..

NAME=s2i-base \
ARCH=x86_64
VERSION=39

LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME" \
name="fedora/$NAME" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base fedora39" \
com.redhat.component="s2i-base-container" \
name="fedora/s2i-base" \
version=39 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN INSTALL_PKGS="autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the
# application runtime execution.
# TODO: Use better UID and GID values

RUN \
INSTALL_PKGS="autoconf \
nodejs20 \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -35,15 +43,17 @@
lsof \
make \
mariadb-connector-c-devel \
nodejs-npm \
openssl-devel \
patch \
procps-ng \
nodejs20-npm \
redhat-rpm-config \
sqlite-devel \
unzip \
wget \
which \
zlib-devel" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf clean all -y
#rpm -V $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
dnf -y clean all --enablerepo='*'
33 changes: 22 additions & 11 deletions base/Dockerfile.f40
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This image is the base image for all OpenShift v3 language container images.
FROM quay.io/fedora/s2i-core:40

ENV SUMMARY="Base image with essential libraries and tools used as a base for \
Expand All @@ -6,21 +7,29 @@
images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=20 \
NAME=s2i-base \
ARCH=x86_64
VERSION=40

LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME" \
name="fedora/$NAME" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base fedora40" \
com.redhat.component="s2i-base-container" \
name="fedora/s2i-base" \
version=40 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN INSTALL_PKGS="autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the
# application runtime execution.
# TODO: Use better UID and GID values

RUN \
INSTALL_PKGS="autoconf \
nodejs20 \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -34,15 +43,17 @@
lsof \
make \
mariadb-connector-c-devel \
nodejs-npm \
openssl-devel \
patch \
procps-ng \
nodejs20-npm \
redhat-rpm-config \
sqlite-devel \
unzip \
wget2 \
wget \
which \
zlib-ng-compat-devel" && \
zlib-devel" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf clean all -y
#rpm -V $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
dnf -y clean all --enablerepo='*'
33 changes: 22 additions & 11 deletions base/Dockerfile.f41
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This image is the base image for all OpenShift v3 language container images.
FROM quay.io/fedora/s2i-core:41

ENV SUMMARY="Base image with essential libraries and tools used as a base for \
Expand All @@ -6,21 +7,29 @@
images layered on top of it with all the tools needed to use source-to-image \
functionality. Additionally, s2i-base also contains various libraries needed for \
it to serve as a base for other builder images, like s2i-python or s2i-ruby." \
NODEJS_VER=22 \
NAME=s2i-base \
ARCH=x86_64
VERSION=41

LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \
io.k8s.description="$DESCRIPTION" \
io.k8s.display-name="s2i base" \
com.redhat.component="$NAME" \
name="fedora/$NAME" \
version="$VERSION" \
maintainer="SoftwareCollections.org <sclorg@redhat.com>"
io.openshift.tags="s2i-base fedora41" \
com.redhat.component="s2i-base-container" \
name="fedora/s2i-base" \
version=41 \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"

# This is the list of basic dependencies that all language container image can
# consume.
RUN INSTALL_PKGS="autoconf \
# Also setup the 'openshift' user that is used for the build execution and for the
# application runtime execution.
# TODO: Use better UID and GID values

RUN \
INSTALL_PKGS="autoconf \
nodejs22 \
automake \
bzip2 \
gcc-c++ \
Expand All @@ -34,15 +43,17 @@
lsof \
make \
mariadb-connector-c-devel \
nodejs-npm \
openssl-devel \
patch \
procps-ng \
nodejs22-npm \
redhat-rpm-config \
sqlite-devel \
unzip \
wget2 \
wget \
which \
zlib-ng-compat-devel" && \
zlib-devel" && \
dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
dnf clean all -y
#rpm -V $INSTALL_PKGS && \
node -v | grep -qe "^v$NODEJS_VER\." && echo "Found VERSION $NODEJS_VER" && \
dnf -y clean all --enablerepo='*'
Loading