Skip to content

Commit 5b1f7f7

Browse files
authored
Merge branch 'main' into cmake4
2 parents f339d37 + e05b0c4 commit 5b1f7f7

File tree

5 files changed

+22
-41
lines changed

5 files changed

+22
-41
lines changed

.github/workflows/cleanup.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ jobs:
1919
permissions:
2020
packages: write
2121
strategy:
22-
fail-fast: false
23-
matrix:
24-
image:
25-
- debian-bullseye
26-
- debian-bookworm
27-
- gcc
28-
- rhel-9.4
29-
- rhel-9.6
30-
- tools-rippled-clang-format
31-
- tools-rippled-documentation
32-
- tools-rippled-pre-commit
33-
- tools-rippled-prettier
34-
- ubuntu-jammy
35-
- ubuntu-noble
22+
fail-fast: false
23+
matrix:
24+
image:
25+
- debian-bullseye
26+
- debian-bookworm
27+
- gcc
28+
- rhel-9.4
29+
- rhel-9.6
30+
- tools-rippled-clang-format
31+
- tools-rippled-documentation
32+
- tools-rippled-pre-commit
33+
- tools-rippled-prettier
34+
- ubuntu-jammy
35+
- ubuntu-noble
3636
steps:
3737
- name: Cleanup images in the GitHub Container Registry
3838
uses: dataaxiom/ghcr-cleanup-action@cd0cdb900b5dbf3a6f2cc869f0dbb0b8211f50c4 # v1.0.16

.github/workflows/gcc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ jobs:
8383
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
8484
with:
8585
build-args: |
86-
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
87-
BUILDKIT_INLINE_CACHE=1
86+
BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
87+
BUILDKIT_INLINE_CACHE=1
8888
context: .
8989
file: docker/gcc/Dockerfile.${{ matrix.os.compiler_version }}-${{ matrix.os.release }}
9090
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/rhel.yml

Lines changed: 5 additions & 5 deletions
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
@@ -53,10 +53,10 @@ jobs:
5353
compiler_version: 14
5454
- release: 9
5555
compiler_name: clang
56-
compiler_version: 'any'
56+
compiler_version: "any"
5757
- release: 10
5858
compiler_name: clang
59-
compiler_version: 'any'
59+
compiler_version: "any"
6060
runs-on: ${{ matrix.architecture.runner }}
6161
permissions:
6262
packages: write
@@ -159,10 +159,10 @@ jobs:
159159
compiler_version: 14
160160
- release: 9
161161
compiler_name: clang
162-
compiler_version: 'any'
162+
compiler_version: "any"
163163
- release: 10
164164
compiler_name: clang
165-
compiler_version: 'any'
165+
compiler_version: "any"
166166
runs-on: ubuntu-24.04
167167
needs:
168168
- build

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)