Skip to content

Commit

Permalink
8.5 release
Browse files Browse the repository at this point in the history
  • Loading branch information
robert-scheck committed Jul 30, 2023
1 parent 989b94f commit 9b513c0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ LABEL maintainer="Robert Scheck <https://github.com/rpki-client/rpki-client-cont
org.label-schema.usage="https://man.openbsd.org/rpki-client" \
org.label-schema.vcs-url="https://github.com/rpki-client"

ARG VERSION=8.4
ARG VERSION=8.5
ARG PORTABLE_GIT
ARG PORTABLE_COMMIT
ARG OPENBSD_GIT
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ While none of the volumes is required, meaningful usage requires at least persis

For custom OCI images, the following build arguments can be passed:

* `VERSION` - Version of the signed portability shim release tarball, defaults to `8.4`.
* `VERSION` - Version of the signed portability shim release tarball, defaults to `8.5`.
* `PORTABLE_GIT` - Git repository URL of the portability shim, defaults to `https://github.com/rpki-client/rpki-client-portable.git`.
* `PORTABLE_COMMIT` - Git commit, branch or tag of the portability shim, e.g. `master`, unset by default.
* `OPENBSD_GIT` - Git repository URL of the OpenBSD source code, defaults to `https://github.com/rpki-client/rpki-client-openbsd.git`.
Expand All @@ -70,7 +70,7 @@ Thus the OCI images are effectively built within the GitHub infrastructure (usin

To avoid maintaining one `Dockerfile` per CPU architecture, the single one is automatically multi-arched using `sed -e 's/^\(FROM\) \(alpine:.*\)/ARG ARCH=\n\1 ${ARCH}\2/' -i Dockerfile` as part of the workflow itself. While this might feel hackish, it practically works very well.

For each release of the project, a new Git branch (named like the version of the release, e.g. `8.4`) is created (based on the default branch, e.g. `master`). The workflow takes care about creating and moving container tags, such as `latest`. By not using Git tags but branches, downstream bug fixes can be easily applied to the OCI image (e.g. for bugs in the `Dockerfile` or patches for the source code itself). Old branches are not touched anymore, equivalent to old release archives.
For each release of the project, a new Git branch (named like the version of the release, e.g. `8.5`) is created (based on the default branch, e.g. `master`). The workflow takes care about creating and moving container tags, such as `latest`. By not using Git tags but branches, downstream bug fixes can be easily applied to the OCI image (e.g. for bugs in the `Dockerfile` or patches for the source code itself). Old branches are not touched anymore, equivalent to old release archives.

Each commit to a Git branch triggers the workflow and leads to OCI images being pushed (except for GitHub pull requests), where the container tag is always based on the Git branch name. OCI images with non-release container tags pushed for testing purposes need to be cleaned up manually at the container repositories. Additionally, a cron-like option in the workflow leads to a nightly build being also tagged as `edge`.

Expand Down

0 comments on commit 9b513c0

Please sign in to comment.