Skip to content

Commit 7e90c39

Browse files
bthomeebthomee
committed
Address first set of review comments
1 parent 90cb6fc commit 7e90c39

File tree

8 files changed

+70
-66
lines changed

8 files changed

+70
-66
lines changed

‎.github/workflows/debian.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ jobs:
3535
run: |
3636
# Convert the repository name to lowercase as the organization name is
3737
# uppercase, which is not permitted by the Docker registry.
38-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
39-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
38+
REPO=${{ github.repository }}
39+
CONTAINER_REPOSITORY=${REPO@L}
40+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/debian-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
4041
- name: Build the Docker image
4142
working-directory: docker/debian
4243
run: |
@@ -47,11 +48,11 @@ jobs:
4748
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
4849
--build-arg DEBIAN_VERSION=${{ matrix.version.os }} \
4950
--build-arg GCC_VERSION=${{ matrix.version.gcc }} \
50-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
51+
--build-arg GITHUB_REPO=${{ github.repository }} \
5152
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
52-
--tag ${{ env.DOCKER_IMAGE }}
53+
--tag ${{ env.CONTAINER_IMAGE }}
5354
- name: Push the Docker image
54-
run: docker push ${{ env.DOCKER_IMAGE }}
55+
run: docker push ${{ env.CONTAINER_IMAGE }}
5556

5657
# Build the Docker image for Debian using different versions of Clang.
5758
clang:
@@ -78,8 +79,9 @@ jobs:
7879
run: |
7980
# Convert the repository name to lowercase as the organization name is
8081
# uppercase, which is not permitted by the Docker registry.
81-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
82-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/debian-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
82+
REPO=${{ github.repository }}
83+
CONTAINER_REPOSITORY=${REPO@L}
84+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/debian-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
8385
- name: Build the Docker image
8486
working-directory: docker/debian
8587
run: |
@@ -90,8 +92,8 @@ jobs:
9092
--build-arg CLANG_VERSION=${{ matrix.version.clang }} \
9193
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
9294
--build-arg DEBIAN_VERSION=${{ matrix.version.os }} \
93-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
95+
--build-arg GITHUB_REPO=${{ github.repository }} \
9496
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
95-
--tag ${{ env.DOCKER_IMAGE }}
97+
--tag ${{ env.CONTAINER_IMAGE }}
9698
- name: Push the Docker image
97-
run: docker push ${{ env.DOCKER_IMAGE }}
99+
run: docker push ${{ env.CONTAINER_IMAGE }}

‎.github/workflows/rhel.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ jobs:
3737
run: |
3838
# Convert the repository name to lowercase as the organization name is
3939
# uppercase, which is not permitted by the Docker registry.
40-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
41-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/rhel-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
40+
REPO=${{ github.repository }}
41+
CONTAINER_REPOSITORY=${REPO@L}
42+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/rhel-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
4243
- name: Build the Docker image
4344
working-directory: docker/rhel
4445
run: |
@@ -48,12 +49,12 @@ jobs:
4849
--build-arg BUILDKIT_INLINE_CACHE=1 \
4950
--build-arg GCC_VERSION=${{ matrix.version.gcc }} \
5051
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
51-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
52+
--build-arg GITHUB_REPO=${{ github.repository }} \
5253
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
5354
--build-arg RHEL_VERSION=${{ matrix.version.os }} \
54-
--tag ${{ env.DOCKER_IMAGE }}
55+
--tag ${{ env.CONTAINER_IMAGE }}
5556
- name: Push the Docker image
56-
run: docker push ${{ env.DOCKER_IMAGE }}
57+
run: docker push ${{ env.CONTAINER_IMAGE }}
5758

5859
# Build the Docker image for Red Hat Enterprise Linux using Clang. As we use
5960
# the free UBIs we cannot select specific versions of Clang and only get what
@@ -75,8 +76,9 @@ jobs:
7576
run: |
7677
# Convert the repository name to lowercase as the organization name is
7778
# uppercase, which is not permitted by the Docker registry.
78-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
79-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/rhel-${{ matrix.version.os }}:clang" >> $GITHUB_ENV
79+
REPO=${{ github.repository }}
80+
CONTAINER_REPOSITORY=${REPO@L}
81+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/rhel-${{ matrix.version.os }}:clang" >> $GITHUB_ENV
8082
- name: Build the Docker image
8183
working-directory: docker/rhel
8284
run: |
@@ -85,9 +87,9 @@ jobs:
8587
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
8688
--build-arg BUILDKIT_INLINE_CACHE=1 \
8789
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
88-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
90+
--build-arg GITHUB_REPO=${{ github.repository }} \
8991
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
9092
--build-arg RHEL_VERSION=${{ matrix.version.os }} \
91-
--tag ${{ env.DOCKER_IMAGE }}
93+
--tag ${{ env.CONTAINER_IMAGE }}
9294
- name: Push the Docker image
93-
run: docker push ${{ env.DOCKER_IMAGE }}
95+
run: docker push ${{ env.CONTAINER_IMAGE }}

‎.github/workflows/ubuntu.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ jobs:
3636
run: |
3737
# Convert the repository name to lowercase as the organization name is
3838
# uppercase, which is not permitted by the Docker registry.
39-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
40-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
39+
REPO=${{ github.repository }}
40+
CONTAINER_REPOSITORY=${REPO@L}
41+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:gcc${{ matrix.version.gcc }}" >> $GITHUB_ENV
4142
- name: Build the Docker image
4243
working-directory: docker/ubuntu
4344
run: |
@@ -47,12 +48,12 @@ jobs:
4748
--build-arg BUILDKIT_INLINE_CACHE=1 \
4849
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
4950
--build-arg GCC_VERSION=${{ matrix.version.gcc }} \
50-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
51+
--build-arg GITHUB_REPO=${{ github.repository }} \
5152
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
5253
--build-arg UBUNTU_VERSION=${{ matrix.version.os }} \
53-
--tag ${{ env.DOCKER_IMAGE }}
54+
--tag ${{ env.CONTAINER_IMAGE }}
5455
- name: Push the Docker image
55-
run: docker push ${{ env.DOCKER_IMAGE }}
56+
run: docker push ${{ env.CONTAINER_IMAGE }}
5657

5758
# Build the Docker image for Ubuntu using different versions of Clang. See
5859
# https://documentation.ubuntu.com/ubuntu-for-developers/reference/availability/llvm/.
@@ -78,8 +79,9 @@ jobs:
7879
run: |
7980
# Convert the repository name to lowercase as the organization name is
8081
# uppercase, which is not permitted by the Docker registry.
81-
DOCKER_REPOSITORY=${GITHUB_REPOSITORY,,}
82-
echo "DOCKER_IMAGE=${CONTAINER_REGISTRY}/${DOCKER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
82+
REPO=${{ github.repository }}
83+
CONTAINER_REPOSITORY=${REPO@L}
84+
echo "CONTAINER_IMAGE=${CONTAINER_REGISTRY}/${CONTAINER_REPOSITORY}/ubuntu-${{ matrix.version.os }}:clang${{ matrix.version.clang }}" >> $GITHUB_ENV
8385
- name: Build the Docker image
8486
working-directory: docker/ubuntu
8587
run: |
@@ -89,9 +91,9 @@ jobs:
8991
--build-arg BUILDKIT_INLINE_CACHE=1 \
9092
--build-arg CLANG_VERSION=${{ matrix.version.clang }} \
9193
--build-arg CONAN_VERSION=${{ env.CONAN_VERSION }} \
92-
--build-arg GITHUB_REPO=${GITHUB_REPOSITORY} \
94+
--build-arg GITHUB_REPO=${{ github.repository }} \
9395
--build-arg NONROOT_USER=${{ env.NONROOT_USER }} \
9496
--build-arg UBUNTU_VERSION=${{ matrix.version.os }} \
95-
--tag ${{ env.DOCKER_IMAGE }}
97+
--tag ${{ env.CONTAINER_IMAGE }}
9698
- name: Push the Docker image
97-
run: docker push ${{ env.DOCKER_IMAGE }}
99+
run: docker push ${{ env.CONTAINER_IMAGE }}

‎docker/debian/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,21 @@ apt install -y tzdata
3232
dpkg-reconfigure --frontend noninteractive tzdata
3333
EOF
3434

35-
# Install tools that are shared by all stages.
35+
# Install tools that are shared by all stages. Run `apt update` again before
36+
# installing the packages to ensure the package lists are up-to-date, which is
37+
# especially important when the image is built from a cached layer.
3638
RUN <<EOF
3739
pkgs=()
38-
pkgs+=(build-essential) # Required build tools.
3940
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
4041
pkgs+=(cmake) # Required build tool.
4142
pkgs+=(curl) # Dependency for tools requiring downloading data.
4243
pkgs+=(git) # Required build tool.
4344
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
4445
pkgs+=(jq) # Pretty printing.
46+
pkgs+=(libc6-dev) # Required build tool.
4547
pkgs+=(ninja-build) # Required build tool.
4648
pkgs+=(pipx) # Package manager for Python applications.
47-
apt install -y "${pkgs[@]}"
49+
apt update && apt install -y "${pkgs[@]}"
4850
EOF
4951

5052
# Install Conan.

‎docker/debian/README.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ NONROOT_USER=${USER}
4242
DEBIAN_VERSION=bookworm
4343
GCC_VERSION=12
4444
CONAN_VERSION=2.17.0
45-
DOCKER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc${GCC_VERSION}
45+
CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:gcc${GCC_VERSION}
4646

47-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
47+
DOCKER_BUILDKIT=1 docker build . \
4848
--target gcc \
4949
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
5050
--build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -53,8 +53,7 @@ DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
5353
--build-arg GCC_VERSION=${GCC_VERSION} \
5454
--build-arg GITHUB_REPO=${GITHUB_REPO} \
5555
--build-arg NONROOT_USER=${NONROOT_USER} \
56-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
57-
--platform linux/amd64
56+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
5857
```
5958

6059
#### Building the Docker image for Clang.
@@ -68,9 +67,9 @@ NONROOT_USER=${USER}
6867
DEBIAN_VERSION=bookworm
6968
CLANG_VERSION=17
7069
CONAN_VERSION=2.17.0
71-
DOCKER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang${CLANG_VERSION}
70+
CONTAINER_IMAGE=xrplf/ci/debian-${DEBIAN_VERSION}:clang${CLANG_VERSION}
7271

73-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
72+
DOCKER_BUILDKIT=1 docker build . \
7473
--target clang \
7574
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
7675
--build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -79,8 +78,7 @@ DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
7978
--build-arg DEBIAN_VERSION=${DEBIAN_VERSION} \
8079
--build-arg GITHUB_REPO=${GITHUB_REPO} \
8180
--build-arg NONROOT_USER=${NONROOT_USER} \
82-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
83-
--platform linux/amd64
81+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
8482
```
8583

8684
#### Running the Docker image
@@ -90,7 +88,7 @@ can do so with the following command:
9088

9189
```shell
9290
CODEBASE=<path to the rippled repository>
93-
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
91+
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
9492
```
9593

9694
Once inside the container you can run the following commands to build `rippled`:
@@ -121,5 +119,5 @@ If you want to push the image to the GitHub registry, you can do so with the
121119
following command:
122120
123121
```shell
124-
docker push ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
122+
docker push ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
125123
```

‎docker/rhel/README.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ NONROOT_USER=${USER}
6161
RHEL_VERSION=9.6
6262
GCC_VERSION=13
6363
CONAN_VERSION=2.17.0
64-
DOCKER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc${GCC_VERSION}
64+
CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:gcc${GCC_VERSION}
6565

66-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
66+
DOCKER_BUILDKIT=1 docker build . \
6767
--target gcc \
6868
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
6969
--build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -72,8 +72,7 @@ DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
7272
--build-arg GITHUB_REPO=${GITHUB_REPO} \
7373
--build-arg NONROOT_USER=${NONROOT_USER} \
7474
--build-arg RHEL_VERSION=${RHEL_VERSION} \
75-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
76-
--platform linux/amd64
75+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
7776
```
7877

7978
#### Building the Docker image for Clang.
@@ -86,18 +85,17 @@ GITHUB_REPO=XRPLF/ci
8685
NONROOT_USER=${USER}
8786
RHEL_VERSION=9.6
8887
CONAN_VERSION=2.17.0
89-
DOCKER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang${CLANG_VERSION}
88+
CONTAINER_IMAGE=xrplf/ci/rhel-${RHEL_VERSION}:clang${CLANG_VERSION}
9089

91-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
90+
DOCKER_BUILDKIT=1 docker build . \
9291
--target clang \
9392
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
9493
--build-arg BUILDKIT_INLINE_CACHE=1 \
9594
--build-arg CONAN_VERSION=${CONAN_VERSION} \
9695
--build-arg GITHUB_REPO=${GITHUB_REPO} \
9796
--build-arg NONROOT_USER=${NONROOT_USER} \
9897
--build-arg RHEL_VERSION=${RHEL_VERSION} \
99-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
100-
--platform linux/amd64
98+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
10199
```
102100

103101
#### Running the Docker image
@@ -107,7 +105,7 @@ can do so with the following command:
107105

108106
```shell
109107
CODEBASE=<path to the rippled repository>
110-
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
108+
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
111109
```
112110

113111
Once inside the container you can run the following commands to build `rippled`:
@@ -137,5 +135,5 @@ If you want to push the image to the GitHub registry, you can do so with the
137135
following command:
138136

139137
```shell
140-
docker push ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
138+
docker push ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
141139
```

‎docker/ubuntu/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ apt install -y tzdata
2121
dpkg-reconfigure --frontend noninteractive tzdata
2222
EOF
2323

24-
# Install tools that are shared by all stages.
24+
# Install tools that are shared by all stages. Run `apt update` again before
25+
# installing the packages to ensure the package lists are up-to-date, which is
26+
# especially important when the image is built from a cached layer.
2527
RUN <<EOF
2628
pkgs=()
27-
pkgs+=(build-essential) # Required build tools.
2829
pkgs+=(ca-certificates) # Enable TLS verification for HTTPS connections by providing trusted root certificates.
2930
pkgs+=(cmake) # Required build tool.
3031
pkgs+=(curl) # Dependency for tools requiring downloading data.
3132
pkgs+=(git) # Required build tool.
3233
pkgs+=(gpg) # Dependency for tools requiring signing or encrypting/decrypting.
3334
pkgs+=(jq) # Pretty printing.
35+
pkgs+=(libc6-dev) # Required build tool.
3436
pkgs+=(ninja-build) # Required build tool.
3537
pkgs+=(pipx) # Package manager for Python applications.
36-
apt install -y "${pkgs[@]}"
38+
apt update && apt install -y "${pkgs[@]}"
3739
EOF
3840

3941
# Install Conan.

‎docker/ubuntu/README.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ NONROOT_USER=${USER}
4242
UBUNTU_VERSION=noble
4343
GCC_VERSION=14
4444
CONAN_VERSION=2.17.0
45-
DOCKER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc${GCC_VERSION}
45+
CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:gcc${GCC_VERSION}
4646

47-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
47+
DOCKER_BUILDKIT=1 docker build . \
4848
--target gcc \
4949
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
5050
--build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -53,8 +53,7 @@ DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
5353
--build-arg GITHUB_REPO=${GITHUB_REPO} \
5454
--build-arg NONROOT_USER=${NONROOT_USER} \
5555
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
56-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
57-
--platform linux/amd64
56+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
5857
```
5958

6059
#### Building the Docker image for Clang.
@@ -68,9 +67,9 @@ NONROOT_USER=${USER}
6867
UBUNTU_VERSION=noble
6968
CLANG_VERSION=18
7069
CONAN_VERSION=2.17.0
71-
DOCKER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang${CLANG_VERSION}
70+
CONTAINER_IMAGE=xrplf/ci/ubuntu-${UBUNTU_VERSION}:clang${CLANG_VERSION}
7271

73-
DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
72+
DOCKER_BUILDKIT=1 docker build . \
7473
--target clang \
7574
--build-arg BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom \
7675
--build-arg BUILDKIT_INLINE_CACHE=1 \
@@ -79,8 +78,7 @@ DOCKER_BUILDKIT=1 BUILDKIT_PROGRESS=plain docker build . \
7978
--build-arg GITHUB_REPO=${GITHUB_REPO} \
8079
--build-arg NONROOT_USER=${NONROOT_USER} \
8180
--build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \
82-
--tag ${CONTAINER_REGISTRY}/${DOCKER_IMAGE} \
83-
--platform linux/amd64
81+
--tag ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
8482
```
8583

8684
#### Running the Docker image
@@ -90,7 +88,7 @@ can do so with the following command:
9088

9189
```shell
9290
CODEBASE=<path to the rippled repository>
93-
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
91+
docker run --rm -it -v ${CODEBASE}:/rippled ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
9492
```
9593

9694
Once inside the container you can run the following commands to build `rippled`:
@@ -120,5 +118,5 @@ If you want to push the image to the GitHub registry, you can do so with the
120118
following command:
121119

122120
```shell
123-
docker push ${CONTAINER_REGISTRY}/${DOCKER_IMAGE}
121+
docker push ${CONTAINER_REGISTRY}/${CONTAINER_IMAGE}
124122
```

0 commit comments

Comments
 (0)