diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 3f8c983..115437c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -31,5 +31,5 @@ jobs: - name: Build setup-hw image run: | - docker build -t quay.io/cybozu/setup-hw:latest --target stage1 docker - docker build -t quay.io/cybozu/setup-hw-secret:latest docker + docker build -t ghcr.io/cybozu-go/setup-hw:latest --target stage1 docker + docker build -t ghcr.io/cybozu-go/setup-hw-secret:latest docker diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e1f33bb..d465c88 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,18 +21,24 @@ jobs: - name: Build setup-hw image run: | - docker build -t quay.io/cybozu/setup-hw:latest --target stage1 docker - docker build -t quay.io/cybozu/setup-hw-secret:latest docker + docker build -t ghcr.io/cybozu-go/setup-hw:latest --target stage1 docker + docker build -t ghcr.io/cybozu-go/setup-hw-secret:latest docker + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push images run: | - echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USER }} --password-stdin quay.io tag=${GITHUB_REF#refs/tags/v} for name in setup-hw setup-hw-secret; do echo "pushing ${name}:v${tag} ..." - docker tag quay.io/cybozu/${name}:latest quay.io/cybozu/${name}:$tag - if ! echo $tag | grep -q -e '-'; then docker push quay.io/cybozu/${name}:latest; fi - docker push quay.io/cybozu/${name}:$tag + docker tag ghcr.io/cybozu-go/${name}:latest ghcr.io/cybozu-go/${name}:$tag + if ! echo $tag | grep -q -e '-'; then docker push ghcr.io/cybozu-go/${name}:latest; fi + docker push ghcr.io/cybozu-go/${name}:$tag done - name: Create release diff --git a/Makefile b/Makefile index e6b6d00..9b3696a 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,6 @@ ifdef GOBIN else cp $(foreach f, $(BINS_IMAGE), $(GOPATH)/bin/$(f)) ./docker/ endif - cd docker && docker build -t quay.io/cybozu/setup-hw:dev . + cd docker && docker build -t ghcr.io/cybozu-go/setup-hw:dev . .PHONY: all generate check-generate setup test install build-image diff --git a/README.md b/README.md index ce34bae..90cb999 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ $ docker run -d --name=setup-hw \ Docker images ------------- -Docker images are available on [Quay.io](https://quay.io/repository/cybozu/setup-hw) +Docker images are available on [ghcr.io](https://github.com/cybozu-go/setup-hw/pkgs/container/setup-hw) ### Access `monitor-hw` diff --git a/docker/Dockerfile b/docker/Dockerfile index ad25150..6104e12 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ FROM ubuntu:22.04 as stage1 +LABEL org.opencontainers.image.source="https://github.com/cybozu-go/setup-hw" COPY setup-hw /usr/local/bin/setup-hw COPY monitor-hw /usr/local/sbin/monitor-hw @@ -9,6 +10,7 @@ CMD ["/usr/local/sbin/monitor-hw"] # Install vendor tools FROM stage1 +LABEL org.opencontainers.image.source="https://github.com/cybozu-go/setup-hw" # See https://linux.dell.com/repo/community/openmanage/ ARG OMSA_VERSION=11000