Skip to content

Commit 6253b80

Browse files
committed
26: Use ghcr.io registry
1 parent 83d0578 commit 6253b80

1 file changed

Lines changed: 11 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
name: CI
22
on: [push, pull_request]
33
env:
4-
dockerns: ${{ vars.dockerns || 'openrct2' }}
5-
dockerid: ${{ secrets.dockerid }}
6-
dockerpass: ${{ secrets.dockerpass }}
4+
REGISTRY: ghcr.io
5+
IMAGE_NAME: ${{ github.repository_owner }}/openrct2-build
76
jobs:
87
build:
98
name: Build
@@ -22,29 +21,21 @@ jobs:
2221
- name: Build docker image
2322
run: |
2423
ctxpath=${dockertag//-/\/}
25-
docker build -t $dockerns/openrct2-build:$dockertag $ctxpath
24+
docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$dockertag $ctxpath
2625
- name: Publish docker image
2726
run: |
28-
if [ "$dockerid" != "" ]; then
29-
docker login -u "$dockerid" -p "$dockerpass"
30-
docker push $dockerns/openrct2-build:$dockertag
31-
else
32-
echo 'Image not pushed'
33-
fi
27+
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
28+
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$dockertag
3429
tag:
3530
name: Tag images
3631
needs: build
3732
runs-on: ubuntu-latest
3833
steps:
3934
- name: Tag docker images
4035
run: |
41-
if [ "$dockerid" != "" ]; then
42-
docker login -u "$dockerid" -p "$dockerpass"
43-
docker pull $dockerns/openrct2-build:26-noble
44-
docker tag $dockerns/openrct2-build:26-noble $dockerns/openrct2-build:26
45-
docker tag $dockerns/openrct2-build:26-noble $dockerns/openrct2-build:latest
46-
docker push $dockerns/openrct2-build:26
47-
docker push $dockerns/openrct2-build:latest
48-
else
49-
echo 'Images not tagged'
50-
fi
36+
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
37+
docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:26-noble
38+
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:26-noble ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:26
39+
docker tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:26-noble ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
40+
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:26
41+
docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

0 commit comments

Comments
 (0)