Skip to content

Commit 0a84707

Browse files
authored
ci: Fix docker CI in forks (#2435)
1 parent 1ec906a commit 0a84707

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

.github/actions/build_docker_image/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ inputs:
2424
dockerhub_repo:
2525
description: DockerHub repository name
2626
required: false
27+
default: ""
2728
dockerhub_description:
2829
description: Short description of the image
2930
required: false

.github/workflows/build_clio_docker_image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,5 @@ jobs:
9797
directory: docker/clio
9898
tags: ${{ inputs.tags }}
9999
platforms: linux/amd64
100-
dockerhub_repo: rippleci/clio
100+
dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio' || '' }}
101101
dockerhub_description: Clio is an XRP Ledger API server.

.github/workflows/update_docker_ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
images: |
7171
${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
72-
rippleci/clio_gcc
72+
${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
7373
push_image: ${{ github.event_name != 'pull_request' }}
7474
directory: docker/compilers/gcc
7575
tags: |
@@ -81,7 +81,7 @@ jobs:
8181
build_args: |
8282
GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
8383
GCC_VERSION=${{ env.GCC_VERSION }}
84-
dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
84+
dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
8585
dockerhub_description: GCC compiler for XRPLF/clio.
8686

8787
gcc-arm64:
@@ -107,7 +107,7 @@ jobs:
107107
with:
108108
images: |
109109
${{ needs.repo.outputs.GHCR_REPO }}/clio-gcc
110-
rippleci/clio_gcc
110+
${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
111111
push_image: ${{ github.event_name != 'pull_request' }}
112112
directory: docker/compilers/gcc
113113
tags: |
@@ -119,7 +119,7 @@ jobs:
119119
build_args: |
120120
GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
121121
GCC_VERSION=${{ env.GCC_VERSION }}
122-
dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
122+
dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_gcc' || '' }}
123123
dockerhub_description: GCC compiler for XRPLF/clio.
124124

125125
gcc-merge:
@@ -196,7 +196,7 @@ jobs:
196196
with:
197197
images: |
198198
${{ needs.repo.outputs.GHCR_REPO }}/clio-clang
199-
rippleci/clio_clang
199+
${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
200200
push_image: ${{ github.event_name != 'pull_request' }}
201201
directory: docker/compilers/clang
202202
tags: |
@@ -206,7 +206,7 @@ jobs:
206206
platforms: linux/amd64,linux/arm64
207207
build_args: |
208208
CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
209-
dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
209+
dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_clang' || '' }}
210210
dockerhub_description: Clang compiler for XRPLF/clio.
211211

212212
tools-amd64:
@@ -321,7 +321,7 @@ jobs:
321321
with:
322322
images: |
323323
${{ needs.repo.outputs.GHCR_REPO }}/clio-ci
324-
rippleci/clio_ci
324+
${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
325325
push_image: ${{ github.event_name != 'pull_request' }}
326326
directory: docker/ci
327327
tags: |
@@ -334,5 +334,5 @@ jobs:
334334
CLANG_MAJOR_VERSION=${{ env.CLANG_MAJOR_VERSION }}
335335
GCC_MAJOR_VERSION=${{ env.GCC_MAJOR_VERSION }}
336336
GCC_VERSION=${{ env.GCC_VERSION }}
337-
dockerhub_repo: ${{ github.repo_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
337+
dockerhub_repo: ${{ github.repository_owner == 'XRPLF' && 'rippleci/clio_ci' || '' }}
338338
dockerhub_description: CI image for XRPLF/clio.

docker/compilers/clang/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN apt-get update \
1818

1919
ARG CLANG_MAJOR_VERSION=invalid
2020
# Bump this version to force rebuild of the image
21-
ARG BUILD_VERSION=0
21+
ARG BUILD_VERSION=1
2222

2323
RUN wget --progress=dot:giga https://apt.llvm.org/llvm.sh \
2424
&& chmod +x llvm.sh \

docker/compilers/gcc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG UBUNTU_VERSION
88

99
ARG GCC_MAJOR_VERSION
1010

11-
ARG BUILD_VERSION=0
11+
ARG BUILD_VERSION=1
1212

1313
ARG DEBIAN_FRONTEND=noninteractive
1414
ARG TARGETARCH

docker/tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ARG TARGETARCH
88

99
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1010

11-
ARG BUILD_VERSION=1
11+
ARG BUILD_VERSION=2
1212

1313
RUN apt-get update \
1414
&& apt-get install -y --no-install-recommends --no-install-suggests \

0 commit comments

Comments
 (0)