Skip to content

Commit 1e87e1b

Browse files
authored
Merge branch 'main' into fix_style
2 parents 0769c36 + b53e8ec commit 1e87e1b

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

.github/workflows/rhel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defaults:
1919
env:
2020
PUSH: ${{ github.ref_type == 'branch' && github.ref_name == github.event.repository.default_branch }}
2121
CONTAINER_REGISTRY: ghcr.io
22-
REDHAT_REGISTRY: registry.redhat.io
22+
REDHAT_REGISTRY: registry.access.redhat.com
2323
BUILDKIT_PROGRESS: plain
2424
CONAN_VERSION: 2.19.1
2525
GCOVR_VERSION: 8.3

docker/rhel/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ====================== BASE IMAGE ======================
22
ARG RHEL_VERSION
33

4-
FROM registry.redhat.io/ubi${RHEL_VERSION}/ubi:latest AS base
4+
FROM registry.access.redhat.com/ubi${RHEL_VERSION}/ubi:latest AS base
55

66
# Use Bash as the default shell for RUN commands, using the options
77
# `set -o errexit -o pipefail`, and as the entrypoint.

docker/rhel/README.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,6 @@ Although the images will be built by a CI pipeline in this repository, if
77
necessary a maintainer can build them manually by following the instructions
88
below.
99

10-
### Logging into the Red Hat registry
11-
12-
To be able to read the Universal Base Images from the Red Hat registry, a
13-
personal access token is needed, which you can get by registering for a
14-
Developer account [here](https://developers.redhat.com) and then creating a
15-
service account [here](https://access.redhat.com/terms-based-registry).
16-
17-
Once created, click on the service account to view its details, and then
18-
navigate to the "Docker Login" tab to get the username and password. A command
19-
is shown that will log you into the Red Hat registry, which looks like this:
20-
21-
```shell
22-
REDHAT_REGISTRY=registry.redhat.io
23-
REDHAT_USER=<your-rhel-username>
24-
REDHAT_TOKEN=<your-rhel-password>
25-
echo ${REDHAT_TOKEN} | \
26-
docker login ${REDHAT_REGISTRY} -u "${REDHAT_USER}" --password-stdin
27-
```
28-
2910
### Logging into the GitHub registry
3011

3112
To be able to push a Docker image to the GitHub registry, a personal access

0 commit comments

Comments
 (0)