Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move last remaining functionality from circle to GHA #1175

Merged
merged 8 commits into from
Jan 30, 2024
Merged

move last remaining functionality from circle to GHA #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5ce591
move last remaining functionalit from circle to GHA
kba Jan 24, 2024
ccfd999
gha/docker-image.yml: typos
kba Jan 24, 2024
bd5ab5a
ci/docker: rename DOCKER_ -> DOCKERIO_ for consistency
kba Jan 30, 2024
5a90517
Merge branch 'master' into circle-to-gha
kba Jan 30, 2024
35ad763
Merge branch 'master' into circle-to-gha
kba Jan 30, 2024
11ecbf9
ci/docker: cluster login to ghcr.io and docker.io
kba Jan 30, 2024
64debc8
ci/docker: typo, images on dockerhub in "ocrd" not "ocr-d"
kba Jan 30, 2024
b21af1b
ci/docker: use secrets for both username and password
kba Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 0 additions & 125 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

32 changes: 25 additions & 7 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
workflow_dispatch: # run manually

env:
DOCKER_TAG: ghcr.io/ocr-d/core
GHCRIO_DOCKER_TAG: ghcr.io/ocr-d/core
DOCKERIO_DOCKER_TAG: docker.io/ocrd/core

jobs:

Expand All @@ -24,22 +25,39 @@ jobs:
uses: docker/setup-buildx-action@v2
- name: Build the Docker image
# default tag uses docker.io, so override on command-line
run: make docker DOCKER_TAG=${{ env.DOCKER_TAG }}
run: make docker DOCKER_TAG=${{ env.GHCRIO_DOCKER_TAG }}
- name: Build the Docker image with GPU support
# default tag uses docker.io, so override on command-line
run: make docker-cuda DOCKER_TAG=${{ env.DOCKER_TAG }}-cuda DOCKER_BASE_IMAGE=${{ env.DOCKER_TAG }}
run: make docker-cuda DOCKER_TAG=${{ env.GHCRIO_DOCKER_TAG }}-cuda DOCKER_BASE_IMAGE=${{ env.GHCRIO_DOCKER_TAG }}
- name: Smoke Test that ocrd --help works
run: |
docker run --rm ${{ env.DOCKER_TAG }} ocrd --version
docker run --rm ${{ env.DOCKER_TAG }}-cuda ocrd --version
docker run --rm ${{ env.GHCRIO_DOCKER_TAG }} ocrd --version
docker run --rm ${{ env.GHCRIO_DOCKER_TAG }}-cuda ocrd --version
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
username: ${{ secrets.DOCKERIO_USERNAME }}
password: ${{ secrets.DOCKERIO_PASSWORD }}
- name: Push images to Github Container Registry
run: |
docker push ${{ env.DOCKER_TAG }}:latest
docker push ${{ env.DOCKER_TAG }}-cuda:latest
docker push ${{ env.GHCRIO_DOCKER_TAG }}:latest
docker push ${{ env.GHCRIO_DOCKER_TAG }}-cuda:latest
- name: Push images to Docker Hub
run: |
docker tag ${{ env.GHCRIO_DOCKER_TAG }} ${{ env.DOCKERIO_DOCKER_TAG }}
docker tag ${{ env.GHCRIO_DOCKER_TAG }}-cuda ${{ env.DOCKERIO_DOCKER_TAG }}-cuda
docker push ${{ env.DOCKERIO_DOCKER_TAG }}:latest
docker push ${{ env.DOCKERIO_DOCKER_TAG }}-cuda:latest
docker push ${{ env.DOCKERIO_DOCKER_TAG }}:latest
docker push ${{ env.DOCKERIO_DOCKER_TAG }}-cuda:latest
docker tag ${{ env.DOCKERIO_DOCKER_TAG }} ${{ env.DOCKERIO_DOCKER_TAG }}:$(git describe --tags --abbrev=0)
docker tag ${{ env.DOCKERIO_DOCKER_TAG }}-cuda ${{ env.DOCKERIO_DOCKER_TAG }}-cuda:$(git describe --tags --abbrev=0)
docker push ${{ env.DOCKERIO_DOCKER_TAG }}:$(git describe --tags --abbrev=0)
docker push ${{ env.DOCKERIO_DOCKER_TAG }}-cuda:$(git describe --tags --abbrev=0)
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
> Python modules implementing [OCR-D specs](https://github.com/OCR-D/spec) and related tools
[![image](https://img.shields.io/pypi/v/ocrd.svg)](https://pypi.org/project/ocrd/)
[![image](https://circleci.com/gh/OCR-D/core.svg?style=svg)](https://circleci.com/gh/OCR-D/core)
[![Docker Image CI](https://github.com/OCR-D/core/actions/workflows/docker-image.yml/badge.svg)](https://github.com/OCR-D/core/actions/workflows/docker-image.yml)
[![Unit Test CI](https://github.com/OCR-D/core/actions/workflows/unit-test.yml/badge.svg)](https://github.com/OCR-D/core/actions/workflows/unit-test.yml)
[![image](https://scrutinizer-ci.com/g/OCR-D/core/badges/build.png?b=master)](https://scrutinizer-ci.com/g/OCR-D/core)
[![image](https://codecov.io/gh/OCR-D/core/branch/master/graph/badge.svg)](https://codecov.io/gh/OCR-D/core)
[![image](https://scrutinizer-ci.com/g/OCR-D/core/badges/build.png?b=master)](https://scrutinizer-ci.com/g/OCR-D/core)
[![image](https://scrutinizer-ci.com/g/OCR-D/core/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/OCR-D/core)

[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/OCR-D/Lobby)
Expand Down
Loading