Skip to content

Commit d3f2e40

Browse files
committed
[WIP] Docker CI Take 2
1 parent f76c046 commit d3f2e40

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.github/workflows/docker.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
REGISTRY: ghcr.io
17-
IMAGE_NAME: ${{ github.repository }}
18-
MANAGED_REGISTRY: registry.digitalocean.com/manifold
16+
GHCR_REGISTRY: ghcr.io
17+
GHCR_IMAGE_NAME: ${{ github.repository }}
18+
MANAGED_REGISTRY: registry.digitalocean.com
19+
MANAGED_IMAGE_NAME: manifold/manifold
1920

2021
jobs:
2122
build-api:
@@ -29,22 +30,22 @@ jobs:
2930
- name: Login GHCR
3031
uses: docker/login-action@v4
3132
with:
32-
registry: ghcr.io
33+
registry: ${{ env.GHCR_REGISTRY }}
3334
username: ${{ github.actor }}
3435
password: ${{ secrets.GITHUB_TOKEN }}
3536
- name: Login DOCR
3637
uses: docker/login-action@v4
3738
with:
38-
registry: registry.digitalocean.com/manifold
39+
registry: ${{ env.MANAGED_REGISTRY }}
3940
username: docr
4041
password: ${{ secrets.DOCR_TOKEN }}
4142
- name: Docker meta
4243
id: meta
4344
uses: docker/metadata-action@v5
4445
with:
4546
images: |
46-
ghcr.io/ManifoldScholar/manifold-api
47-
registry.digitalocean.com/manifold/manifold-api
47+
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_IMAGE_NAME }}-api
48+
${{ env.MANAGED_REGISTRY }}/${{ env.MANAGED_IMAGE_NAME }}-api
4849
tags: |
4950
type=raw,value=latest,enable=${{ github.ref_name == 'release' }}
5051
type=raw,value=edge,enable={{ is_default_branch }}
@@ -90,7 +91,9 @@ jobs:
9091
id: meta
9192
uses: docker/metadata-action@v5
9293
with:
93-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-client
94+
images: |
95+
${{ env.GHCR_REGISTRY }}/${{ env.GHCR_IMAGE_NAME }}-client
96+
${{ env.MANAGED_REGISTRY }}/${{ env.MANAGED_IMAGE_NAME }}-client
9497
tags: |
9598
type=raw,value=latest,enable=${{ github.ref_name == 'release' }}
9699
type=raw,value=edge,enable={{ is_default_branch }}

0 commit comments

Comments
 (0)