Skip to content

Commit 9eb0274

Browse files
committed
コンテナレジストリ変更
1 parent d702a53 commit 9eb0274

File tree

2 files changed

+26
-13
lines changed

2 files changed

+26
-13
lines changed

.github/workflows/cd-for-misskey-na2na.yml

+21-9
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,34 @@ jobs:
2626
- name: Check Docker Hub
2727
id: check_docker_hub
2828
run: |
29-
DOCKER_HUB_TAGS=$(curl -s https://registry.hub.docker.com/v2/repositories/na2na/misskey-na2na/tags | jq -r '.results[] | .name')
30-
if [ $(echo $DOCKER_HUB_TAGS | grep -c $MISSKEY_VERSION) -eq 1 ]; then
31-
echo "Tag $MISSKEY_VERSION already exists on Docker Hub."
32-
else
33-
echo "Tag $MISSKEY_VERSION does not exist on Docker Hub."
34-
echo "tag_exists=false" >> $GITHUB_OUTPUT
35-
echo "MISSKEY_VERSION=$MISSKEY_VERSION" >> $GITHUB_OUTPUT
36-
fi
29+
digests=$(curl -s 'https://registry.na2na.dev/api/v2.0/projects/misskey/repositories/misskey-na2na/artifacts?with_tag=false&with_label=false&with_scan_overview=false&with_sbom_overview=false&with_signature=false&with_immutable_status=false&with_accessory=false' | jq -r '.[].digest')
30+
is_exists=false
31+
check_tag_exists() {
32+
local digest=$1
33+
local version=$2
34+
tags=$(curl -s "https://registry.na2na.dev/api/v2.0/projects/misskey/repositories/misskey-na2na/artifacts/$digest/tags" | jq -r '.[].name')
35+
if echo "$tags" | grep -q "^$version$"; then
36+
is_exists=true
37+
echo "Tag $version already exists for digest $digest."
38+
return 0
39+
else
40+
echo "Tag $version does not exist for digest $digest."
41+
is_exists=false
42+
echo "MISSKEY_VERSION=$version" >> $GITHUB_OUTPUT
43+
fi
44+
}
45+
for digest in $digests; do
46+
check_tag_exists "$digest" "$MISSKEY_VERSION"
47+
done
48+
echo "tag_exists=$is_exists" >> $GITHUB_OUTPUT
3749
3850
Build-and-Push-to-Docker-Hub:
3951
needs:
4052
- Prepare
4153
if: ${{ needs.Prepare.outputs.tag_exists == 'false' }}
4254
with:
4355
MISSKEY_VERSION: ${{ needs.Prepare.outputs.MISSKEY_VERSION }}
44-
IMAGE_REPOSITORY: na2na
56+
IMAGE_REPOSITORY: misskey
4557
IMAGE_NAME: misskey-na2na
4658
uses: ./.github/workflows/image-push-for-misskey-na2na-release.yml
4759
secrets: inherit

.github/workflows/image-push-for-misskey-na2na-release.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@ jobs:
4040
- name: Login to Docker Hub
4141
uses: docker/login-action@v3
4242
with:
43-
username: ${{ vars.DOCKER_USERNAME }}
44-
password: ${{ secrets.DOCKER_PASSWORD }}
43+
registry: registry.na2na.dev
44+
username: ${{ secrets.REGISTRY_USERNAME }}
45+
password: ${{ secrets.REGISTRY_PASSWORD }}
4546
- name: Build Docker Image
4647
run: |
4748
docker buildx bake \
4849
-f 'infra/web/image-bake.hcl' \
4950
--builder="${{ steps.buildx.outputs.name }}" \
50-
--set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ inputs.MISSKEY_VERSION }}' \
51-
--set='web.tags=${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ steps.prepare-for-build.outputs.sha_short }}' \
51+
--set='web.tags=registry.na2na.dev/${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ inputs.MISSKEY_VERSION }}' \
52+
--set='web.tags=registry.na2na.dev/${{ inputs.IMAGE_REPOSITORY }}/${{ inputs.IMAGE_NAME }}:${{ steps.prepare-for-build.outputs.sha_short }}' \
5253
--push

0 commit comments

Comments
 (0)