Skip to content

Commit

Permalink
registry must include slash
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhollas committed May 24, 2024
1 parent 7c7d114 commit f955ac1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ By default, all image variants are build. You can specify a single target image
### Run automated tests

To run tests, first build the images as described in the previous section.
Then run the automated tests with `doit tests`.
Then run the automated tests for a given image with `doit tests --target <base|base-with-services|lab|full-stack>`.

Tip: The [continuous integration](#continuous-integration) workflow will build, release (at `ghcr.io/aiidalab/*:pr-###`), and test images for all pull requests into the default branch.

Expand All @@ -69,7 +69,7 @@ For manual testing, you can start the images with `doit up --target full-stack`,
### Continuous integration

Images are built for `linux/amd64` and `linux/arm64` during continuous integration for all pull requests into the default branch and pushed to the GitHub Container Registry (ghcr.io) with tags `ghcr.io/aiidalab/*:pr-###`.
You can run automated or manual tests against those images by specifying the registry and version for both the `up` and `tests` commands, example: `doit up --registry=ghcr.io --version=pr-123`.
You can run automated or manual tests against those images by specifying the registry and version for both the `up` and `tests` commands, example: `doit tests --registry=ghcr.io/ --version=pr-123`.

### Creating a release

Expand Down
8 changes: 4 additions & 4 deletions dodo.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"long": "registry",
"type": str,
"default": "",
"help": "Specify the docker image registry (without the trailing slash).",
"help": "Specify the docker image registry (including the trailing slash).",
}

_ORGANIZATION_PARAM = {
Expand Down Expand Up @@ -114,7 +114,7 @@ def generate_version_override(
platforms = [f"linux/{architecture}"]
overrides = {
"VERSION": f":{version}",
"REGISTRY": f"{registry}/",
"REGISTRY": registry,
"ORGANIZATION": organization,
"PLATFORMS": platforms,
}
Expand Down Expand Up @@ -150,7 +150,7 @@ def task_tests():
return {
"actions": [
target_required,
"AIIDALAB_PORT=%(port)i REGISTRY=%(registry)s/ VERSION=:%(version)s "
"AIIDALAB_PORT=%(port)i REGISTRY=%(registry)s VERSION=:%(version)s "
"pytest -s --target %(target)s --compose-cmd='%(compose-command)s' %(pytest-opts)s",
],
"params": [
Expand All @@ -177,7 +177,7 @@ def task_up():
return {
"actions": [
target_required,
"AIIDALAB_PORT=%(port)i REGISTRY=%(registry)s/ VERSION=:%(version)s "
"AIIDALAB_PORT=%(port)i REGISTRY=%(registry)s VERSION=:%(version)s "
"%(compose-command)s -f stack/docker-compose.%(target)s.yml up --detach",
],
"params": [
Expand Down

0 comments on commit f955ac1

Please sign in to comment.