Skip to content

Commit

Permalink
style(ct-base): rephrase container image tags IQSS#8932
Browse files Browse the repository at this point in the history
As requested by review from @pdurbin, aligning image tag names.
  • Loading branch information
poikilotherm committed Nov 10, 2022
1 parent f1a64a8 commit 426f746
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/container_base_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- '.github/workflows/container_base_push.yml'

env:
IMAGE_TAG: develop
IMAGE_TAG: unstable
REGISTRY: docker.io

jobs:
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
uses: docker/setup-qemu-action@v2
- name: Re-set image tag based on branch
if: ${{ github.ref_name == 'master' }}
run: echo "IMAGE_TAG=release"
run: echo "IMAGE_TAG=stable"
- if: ${{ github.event_name != 'pull_request' }}
name: Deploy multi-arch base container image to Docker Hub
run: mvn -f modules/container-base -Pct deploy -Dbase.image.tag=${{ env.IMAGE_TAG }} -Ddocker.registry=${{ env.REGISTRY }}
10 changes: 6 additions & 4 deletions doc/sphinx-guides/source/container/base-image.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ efforts.
Supported Image Tags
++++++++++++++++++++

This image is sourced within the main upstream code repository of the Dataverse software. Development and maintenance
happens there (again, by the community). Community supported image tags are based on the two most important branches:
This image is sourced from the main upstream code `repository of the Dataverse software <https://github.com/IQSS/dataverse>`_.
Development and maintenance of the `image's code <https://github.com/IQSS/dataverse/tree/develop/modules/container-base>`
happens there (again, by the community). Community-supported image tags are based on the two most important
upstream branches:

- ``develop`` representing the unstable state of affairs in Dataverse's development branch
- The ``unstable`` tag corresponds to the ``develop`` branch, where pull requests are merged.
(`Dockerfile <https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile>`__)
- ``release`` representing the latest stable release in Dataverse's main branch
- The ``stable`` tag corresponds to the ``master`` branch, where releases are cut from.
(`Dockerfile <https://github.com/IQSS/dataverse/tree/master/modules/container-base/src/main/docker/Dockerfile>`__)


Expand Down
8 changes: 4 additions & 4 deletions modules/container-base/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ https://dataversecommunity.slack.com to ask for help and guidance.
## Supported Image Tags

This image is sourced within the main upstream code [repository of the Dataverse software](https://github.com/IQSS/dataverse).
Development and maintenance happens there (again, by the community). Community-supported image tags are based on the two
most important branches:
Development and maintenance of the [image's code](https://github.com/IQSS/dataverse/tree/develop/modules/container-base)
happens there (again, by the community). Community-supported image tags are based on the two most important branches:

- `develop` representing the unstable state of affairs in Dataverse's development branch
- The `unstable` tag corresponds to the `develop` branch, where pull requests are merged.
([`Dockerfile`](https://github.com/IQSS/dataverse/tree/develop/modules/container-base/src/main/docker/Dockerfile))
- `release` representing the latest stable release in Dataverse's main branch
- The `stable` tag corresponds to the `master` branch, where releases are cut from.
([`Dockerfile`](https://github.com/IQSS/dataverse/tree/master/modules/container-base/src/main/docker/Dockerfile))

Within the main repository, you may find the base image files at `<git root>/modules/container-base`.
Expand Down
2 changes: 1 addition & 1 deletion modules/container-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<properties>
<packaging.type>docker-build</packaging.type>
<base.image>gdcc/base:${base.image.tag}</base.image>
<base.image.tag>develop</base.image.tag>
<base.image.tag>unstable</base.image.tag>
<java.image>eclipse-temurin:${target.java.version}-jre</java.image>
<base.image.uid>1000</base.image.uid>
<base.image.gid>1000</base.image.gid>
Expand Down

0 comments on commit 426f746

Please sign in to comment.