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.

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

OCR-D Manager base version #100

Merged
merged 2 commits into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
COMPOSE_PROJECT_NAME=ocrd_kitodo

# Manager SSH server
MANAGER_BASE_VERSION=latest # tag of ocrd/core from stage version
MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:latest # name and tag of image
MANAGER_HOST=ocrd-manager # name/address of server (for Kitodo)
MANAGER_PORT_SSH=9022 # host-side port to exposed SSH server (for external Kitodo)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/makefile-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
- name: Dispatch OCR-D Manager workflow and waiting for completion
uses: aurelien-baudet/workflow-dispatch@v2
with:
inputs: '{ "checkout-ref": "${{ env.MANAGER_CHECKOUT_REF }}", "image-tag": "${{ env.MANAGER_IMAGE_TAG }}" }'
inputs: '{ "checkout-ref": "${{ env.MANAGER_CHECKOUT_REF }}", "image-tag": "${{ env.MANAGER_IMAGE_TAG }}", "ocrd-core-version": "${{ steps.dotenv.outputs.MANAGER_BASE_VERSION }}" }'
ref: 'main'
repo: slub/ocrd_manager
token: ${{ secrets.SUB_REPO_TOKEN }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/release-stable-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ on:
workflow_dispatch:
inputs:
ocrd-all-version:
description: Stable tag of ocrd/all from stage
description: Stable tag of ocrd/all from stage for OCR-D Controller
required: true
ocrd-core-version:
description: Stable tag of ocrd/core from stage for OCR-D Manager
required: true

jobs:
build-pr:
Expand All @@ -33,6 +36,7 @@ jobs:
# Update .env
sed -i 's|CONTROLLER_BASE_VERSION=maximum-cuda|CONTROLLER_BASE_VERSION=${{ github.event.inputs.ocrd-all-version }}|g' .env
sed -i 's|CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:latest|CONTROLLER_IMAGE=ghcr.io/slub/ocrd_controller:stable|g' .env
sed -i 's|MANAGER_BASE_VERSION=latest|MANAGER_BASE_VERSION=${{ github.event.inputs.ocrd-core-version }}|g' .env
sed -i 's|MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:latest|MANAGER_IMAGE=ghcr.io/slub/ocrd_manager:stable|g' .env
sed -i 's|MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:latest|MONITOR_IMAGE=ghcr.io/slub/ocrd_monitor:stable|g' .env
shell: bash
Expand All @@ -47,6 +51,7 @@ jobs:
- Update CHANGELOG.md
- Update .env
- Replace `CONTROLLER_BASE_VERSION` with `${{ github.event.inputs.ocrd-all-version }}`
- Replace `MANAGER_BASE_VERSION` with `${{ github.event.inputs.ocrd-core-version }}`
- Replace `latest` with `stable`

## Manual steps to provide new release ${{ env.release_version }}
Expand Down
2 changes: 1 addition & 1 deletion _modules/ocrd_manager
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ services:
depends_on:
- ocrd-controller
- ocrd-database
build:
args:
VERSION: ${MANAGER_BASE_VERSION}

ocrd-monitor:
extends:
Expand Down Expand Up @@ -44,7 +47,6 @@ services:
service: ocrd-controller
profiles:
- with-ocrd-controller

build:
args:
VERSION: ${CONTROLLER_BASE_VERSION}
Expand Down