Skip to content

Commit a0817ad

Browse files
jiridanekjiridanek
authored
Merge pull request #1714 from jiridanek/jd_rhds_sync_again
RHOAIENG-32541: merge remote-tracking branch 'origin/main' into jd_rhds_sync_again
2 parents a8a75f4 + a90c7b4 commit a0817ad

File tree

44 files changed

+63
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+63
-215
lines changed

‎codeserver/ubi9-python-3.12/Dockerfile.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
8888
RUN /bin/bash <<'EOF'
8989
set -Eeuxo pipefail
9090
if command -v subscription-manager &> /dev/null; then
91-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
91+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
9292
fi
9393
EOF
9494

‎codeserver/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
8888
RUN /bin/bash <<'EOF'
8989
set -Eeuxo pipefail
9090
if command -v subscription-manager &> /dev/null; then
91-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
91+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
9292
fi
9393
EOF
9494

‎jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
5757
RUN /bin/bash <<'EOF'
5858
set -Eeuxo pipefail
5959
if command -v subscription-manager &> /dev/null; then
60-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
60+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
6161
fi
6262
EOF
6363

‎jupyter/datascience/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
5757
RUN /bin/bash <<'EOF'
5858
set -Eeuxo pipefail
5959
if command -v subscription-manager &> /dev/null; then
60-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
60+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
6161
fi
6262
EOF
6363

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
4545
RUN /bin/bash <<'EOF'
4646
set -Eeuxo pipefail
4747
if command -v subscription-manager &> /dev/null; then
48-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
48+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
4949
fi
5050
EOF
5151

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2828
RUN /bin/bash <<'EOF'
2929
set -Eeuxo pipefail
3030
if command -v subscription-manager &> /dev/null; then
31-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
31+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
3232
fi
3333
EOF
3434

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cpu‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
4545
RUN /bin/bash <<'EOF'
4646
set -Eeuxo pipefail
4747
if command -v subscription-manager &> /dev/null; then
48-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
48+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
4949
fi
5050
EOF
5151

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.cuda‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2828
RUN /bin/bash <<'EOF'
2929
set -Eeuxo pipefail
3030
if command -v subscription-manager &> /dev/null; then
31-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
31+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
3232
fi
3333
EOF
3434

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.konflux.rocm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2626
RUN /bin/bash <<'EOF'
2727
set -Eeuxo pipefail
2828
if command -v subscription-manager &> /dev/null; then
29-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
29+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
3030
fi
3131
EOF
3232

‎jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ COPY --from=ubi-repos /etc/yum.repos.d/ubi.repo /etc/yum.repos.d/ubi.repo
2626
RUN /bin/bash <<'EOF'
2727
set -Eeuxo pipefail
2828
if command -v subscription-manager &> /dev/null; then
29-
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "Not registered, skipping refresh."
29+
subscription-manager identity &>/dev/null && subscription-manager refresh || echo "No identity, skipping refresh."
3030
fi
3131
EOF
3232

0 commit comments

Comments
 (0)