Skip to content

Commit c2f4675

Browse files
committed
26: Use ghcr.io registry
1 parent d3bb699 commit c2f4675

1 file changed

Lines changed: 13 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
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
75
jobs:
86
build:
97
name: Build
@@ -22,29 +20,24 @@ jobs:
2220
- name: Build docker image
2321
run: |
2422
ctxpath=${dockertag//-/\/}
25-
docker build -t $dockerns/openrct2-build:$dockertag $ctxpath
23+
SLUG=$(echo ${{ github.repository_owner }}/openrct2-build | tr '[A-Z]' '[a-z]')
24+
docker build -t ${{ env.REGISTRY }}/$SLUG:$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+
SLUG=$(echo ${{ github.repository_owner }}/openrct2-build | tr '[A-Z]' '[a-z]')
29+
docker push ${{ env.REGISTRY }}/$SLUG:$dockertag
3430
tag:
3531
name: Tag images
3632
needs: build
3733
runs-on: ubuntu-latest
3834
steps:
3935
- name: Tag docker images
4036
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
37+
SLUG=$(echo ${{ github.repository_owner }}/openrct2-build | tr '[A-Z]' '[a-z]')
38+
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
39+
docker pull ${{ env.REGISTRY }}/$SLUG:26-noble
40+
docker tag ${{ env.REGISTRY }}/$SLUG:26-noble ${{ env.REGISTRY }}/$SLUG:26
41+
docker tag ${{ env.REGISTRY }}/$SLUG:26-noble ${{ env.REGISTRY }}/$SLUG:latest
42+
docker push ${{ env.REGISTRY }}/$SLUG:26
43+
docker push ${{ env.REGISTRY }}/$SLUG:latest

0 commit comments

Comments
 (0)