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

Update publish.yml to build stable version #25

Merged
merged 2 commits into from
Mar 17, 2023
Merged

Conversation

markusweigelt
Copy link
Collaborator

No description provided.

@markusweigelt markusweigelt changed the title Update publish.yml to support stable version Update publish.yml to build stable version Mar 17, 2023
@markusweigelt markusweigelt requested a review from bertsky March 17, 2023 11:32
@markusweigelt
Copy link
Collaborator Author

markusweigelt commented Mar 17, 2023

After we have created the stable branch we still need to adjust the docker-compose.yml and add the version argument for the parent version.

Copy link
Member

@bertsky bertsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bertsky
Copy link
Member

bertsky commented Mar 17, 2023

After we have created the stable branch we still need to adjust the docker-compose.yml and add the version argument for the parent version.

You mean the OCRD_ALL_VERSION?

Actually, I now believe we should track that in the repo itself. So the build-args would read from a repo-managed file – say base.version – which naturally on master would simply be maximum-git but on stable represent a date release which we could edit every once in a while.

@bertsky
Copy link
Member

bertsky commented Mar 17, 2023

Actually, I now believe we should track that in the repo itself. So the build-args would read from a repo-managed file – say base.version – which naturally on master would simply be maximum-git but on stable represent a date release which we could edit every once in a while.

Or better yet: track ocrd_all as a subrepo (without checkout or even recursive checkout of course). The same could be done for core in ocrd_manager.

@markusweigelt
Copy link
Collaborator Author

markusweigelt commented Mar 17, 2023

This all sounds like a lot of overhead than adding single build arg to docker-compose only in the stable branch.

Btw cool there are ocrd/core version distinctions on Docker Hub now 😎

@bertsky
Copy link
Member

bertsky commented Mar 17, 2023

This all sounds like a lot of overhead than adding single build arg to docker-compose only in the stable branch.

indeed, forgot about that. Let's use only that then!

Currently, we pass VCS_REF and BUILD_DATE dynamically, and your new OCRD_ALL_VERSION gets set on the CI statically. IMO the latter would need to be changed. Instead, set VERSION in docker-compose.yml directly, so it can be version controlled (and also applies for local builds via Dockerfile btw).

add yaml parser for docker-compose and parse stable VERSION arg to OCRD_ALL_VERSION
@markusweigelt
Copy link
Collaborator Author

Solved it a bit differently but almost as good (since the current docker/build-push-action works so well incl. caching etc.). I hope it fits like this.

@markusweigelt markusweigelt merged commit 9c43ed8 into master Mar 17, 2023
@markusweigelt markusweigelt deleted the support-stable branch March 17, 2023 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants