Skip to content

Commit

Permalink
ci: fix cd and release docker image tags
Browse files Browse the repository at this point in the history
  • Loading branch information
hanxiao committed Jan 11, 2021
1 parent f5289f5 commit 8b9aa25
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
if [[ "${{ matrix.tag_stage }}" == "-daemon" ]]; then
echo "BUILD_ARG=--target jina_daemon" >> $GITHUB_ENV
elif [[ "${{ matrix.tag_stage }}" == "-devel" ]]
elif [[ "${{ matrix.tag_stage }}" == "-devel" ]]; then
echo "BUILD_ARG=--target jina_devel" >> $GITHUB_ENV
else
echo "BUILD_ARG=--target jina_base" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
if [[ "${{ matrix.tag_stage }}" == "-daemon" ]]; then
echo "BUILD_ARG=--target jina_daemon" >> $GITHUB_ENV
elif [[ "${{ matrix.tag_stage }}" == "-devel" ]]
elif [[ "${{ matrix.tag_stage }}" == "-devel" ]]; then
echo "BUILD_ARG=--target jina_devel" >> $GITHUB_ENV
else
echo "BUILD_ARG=--target jina_base" >> $GITHUB_ENV
Expand Down
25 changes: 9 additions & 16 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jinaai/jina:{version}{python_version}{extra}
- `{extra}`: the extra dependency installed along with Jina. Possible values:
- ` `: Jina is installed inside the image via `pip install jina`;
- `-devel`: Jina is installed inside the image via `pip install jina[devel]`;
- `-daemon`: Jina is installed inside the image via `pip install jina[dameon]`; and the entrypoint is set to `jinad`
- `-daemon`: Jina is installed inside the image via `pip install jina[dameon]` along with `fluentd`; and the entrypoint is set to `jinad`

Examples:

Expand All @@ -53,24 +53,17 @@ Use `-devel` image, if you want to use:

On every master merge, the following images got updated:

- `jinaai/jina:master{python_version}{extra}`
| Timing | Affected tags |
| --- | --- |
| On Master Merge | `jinaai/jina:master{python_version}{extra}` |
| On `x.y.z` release | `jinaai/jina:latest{python_version}{extra}`, `jinaai/jina:x.y.z{python_version}{extra}`, `jinaai/jina:x.y{python_version}{extra}` |

, where:
- dependency: `["", "-devel"]`
- python_version: `["-py37", "-py38"]`
- entrypoint: `["", "-daemon"]`

On every `x.y.z` release, the following images got update:

- `jinaai/jina:latest{python_version}{extra}`
- `jinaai/jina:x.y.z{python_version}{extra}`
- `jinaai/jina:x.y{python_version}{extra},`

, `latest` & `x.y.z` & `x.y` are aliases, and where
- python_version: `["-py37", "-py38"]`
- extra: `["", "-devel", "-daemon"]`
, where
- `{python_version} = ["-py37", "-py38"]`
- `extra = ["", "-devel", "-daemon"]`



### Image Size of Different Versions

![](https://img.shields.io/docker/image-size/jinaai/jina/latest?label=jinaai%2Fjina%3Alatest&logo=docker)
Expand Down

0 comments on commit 8b9aa25

Please sign in to comment.