Skip to content

Commit 2015e37

Browse files
efiacorliamfallon
efiacor
and
liamfallon
authored
Move docker builds to ghcr (#982)
* Move docker builds to ghcr Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> * Apply suggestion from @liamfallon --------- Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech> Co-authored-by: Liam Fallon <35595825+liamfallon@users.noreply.github.com>
1 parent 0654c7d commit 2015e37

18 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎.github/workflows/image-build-push-dev.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
workflow_dispatch:
88

99
env:
10-
REGISTRY: docker.io
11-
ORG: nephio
10+
REGISTRY: ghcr.io
11+
ORG: kptdev
1212

1313
permissions:
1414
contents: read
@@ -22,13 +22,13 @@ jobs:
2222
matrix:
2323
include:
2424
- dockerfile: ./build/Dockerfile
25-
image: docker.io/nephio/porch-server
25+
image: ghcr.io/kptdev/porch-server
2626
- dockerfile: ./controllers/Dockerfile
27-
image: docker.io/nephio/porch-controllers
27+
image: ghcr.io/kptdev/porch-controllers
2828
- dockerfile: ./func/Dockerfile
29-
image: docker.io/nephio/porch-function-runner
29+
image: ghcr.io/kptdev/porch-function-runner
3030
- dockerfile: ./func/Dockerfile-wrapperserver
31-
image: docker.io/nephio/porch-wrapper-server
31+
image: ghcr.io/kptdev/porch-wrapper-server
3232
permissions:
3333
contents: read
3434
packages: write
@@ -53,8 +53,8 @@ jobs:
5353
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
5454
with:
5555
registry: ${{ env.REGISTRY }}
56-
username: ${{ vars.DOCKERHUB_USERNAME }}
57-
password: ${{ secrets.DOCKERHUB_TOKEN }}
56+
username: ${{ github.actor }}
57+
password: ${{ secrets.GITHUB_TOKEN }}
5858

5959
- name: Set up Docker Buildx
6060
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

‎.github/workflows/image-build-push-release.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
- "v[0-9]+.[0-9]+.[0-9]-pre[0-9]+"
88

99
env:
10-
REGISTRY: docker.io
11-
ORG: nephio
10+
REGISTRY: ghcr.io
11+
ORG: kptdev
1212

1313
permissions:
1414
contents: read
@@ -22,13 +22,13 @@ jobs:
2222
matrix:
2323
include:
2424
- dockerfile: ./build/Dockerfile
25-
image: docker.io/nephio/porch-server
25+
image: ghcr.io/kptdev/porch-server
2626
- dockerfile: ./controllers/Dockerfile
27-
image: docker.io/nephio/porch-controllers
27+
image: ghcr.io/kptdev/porch-controllers
2828
- dockerfile: ./func/Dockerfile
29-
image: docker.io/nephio/porch-function-runner
29+
image: ghcr.io/kptdev/porch-function-runner
3030
- dockerfile: ./func/Dockerfile-wrapperserver
31-
image: docker.io/nephio/porch-wrapper-server
31+
image: ghcr.io/kptdev/porch-wrapper-server
3232
permissions:
3333
contents: read
3434
packages: write
@@ -53,8 +53,8 @@ jobs:
5353
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
5454
with:
5555
registry: ${{ env.REGISTRY }}
56-
username: ${{ vars.DOCKERHUB_USERNAME }}
57-
password: ${{ secrets.DOCKERHUB_TOKEN }}
56+
username: ${{ github.actor }}
57+
password: ${{ secrets.GITHUB_TOKEN }}
5858

5959
- name: Set up Docker Buildx
6060
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: ./.github/actions/setup-go-kpt
4040

4141
- name: Build porch blueprint
42-
run: PATH=./bin:$PATH IMAGE_REPO=docker.io/nephio IMAGE_TAG=${{ github.ref_name }} PORCH_CACHE_TYPE=CR make deployment-config
42+
run: PATH=./bin:$PATH IMAGE_REPO=ghcr.io/kptdev IMAGE_TAG=${{ github.ref_name }} PORCH_CACHE_TYPE=CR make deployment-config
4343

4444
- name: Run GoReleaser
4545
id: run-goreleaser

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export DEPLOYPORCHCONFIGDIR ?= $(BUILDDIR)/deploy
2626
DEPLOYKPTCONFIGDIR=$(BUILDDIR)/kpt_pkgs
2727

2828
# Image configuration
29-
export IMAGE_REPO ?= docker.io/nephio
30-
export USER ?= nephio
29+
export IMAGE_REPO ?= ghcr.io/kptdev
30+
export USER ?= porch
3131

3232
export IMAGE_TAG
3333
ifndef IMAGE_TAG

‎controllers/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
IMAGE_TAG ?= latest
16-
IMAGE_REPO ?= docker.io/nephio
16+
IMAGE_REPO ?= ghcr.io/kptdev
1717
IMAGE_NAME ?= porch-controllers
1818

1919
.PHONY: build-image docker-build

‎deployments/function-pods/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ data:
2626
spec:
2727
initContainers:
2828
- name: copy-wrapper-server
29-
image: docker.io/nephio/porch-wrapper-server:latest
29+
image: ghcr.io/kptdev/porch-wrapper-server:latest
3030
command:
3131
- cp
3232
- -a

‎deployments/porch/2-function-runner.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
serviceAccountName: porch-fn-runner
3636
containers:
3737
- name: function-runner
38-
image: docker.io/nephio/porch-function-runner:latest
38+
image: ghcr.io/kptdev/porch-function-runner:latest
3939
imagePullPolicy: IfNotPresent
4040
securityContext:
4141
runAsNonRoot: true
@@ -51,7 +51,7 @@ spec:
5151
- --functions=/home/nonroot/functions
5252
env:
5353
- name: WRAPPER_SERVER_IMAGE
54-
value: docker.io/nephio/porch-wrapper-server:latest
54+
value: ghcr.io/kptdev/porch-wrapper-server:latest
5555
- name: OTEL_METRICS_EXPORTER
5656
value: "prometheus"
5757
- name: OTEL_EXPORTER_PROMETHEUS_HOST

‎deployments/porch/22-function-templates.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ template:
2424
spec:
2525
initContainers:
2626
- name: copy-wrapper-server
27-
image: docker.io/nephio/porch-wrapper-server:latest
27+
image: ghcr.io/kptdev/porch-wrapper-server:latest
2828
command:
2929
- cp
3030
- -a

‎deployments/porch/3-porch-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
containers:
4444
- name: porch-server
4545
# Update image to the image of your porch apiserver build.
46-
image: docker.io/nephio/porch-server:latest
46+
image: ghcr.io/kptdev/porch-server:latest
4747
imagePullPolicy: IfNotPresent
4848
securityContext:
4949
runAsNonRoot: true

‎deployments/porch/9-controllers.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
containers:
4242
- name: porch-controllers
4343
# Update to the image of your porch-controllers build.
44-
image: docker.io/nephio/porch-controllers:latest
44+
image: ghcr.io/kptdev/porch-controllers:latest
4545
imagePullPolicy: IfNotPresent
4646
args:
4747
- --repositories.cache-type=DB

0 commit comments

Comments
 (0)