Skip to content

Commit

Permalink
Prefix container image with "pyrex-"
Browse files Browse the repository at this point in the history
The new GHCR repo doesn't have "pyrex" in the namespace, so add a prefix
of "pyrex-" to the produced images
  • Loading branch information
JoshuaWatt committed Dec 4, 2024
1 parent 589b631 commit 877b03e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ jobs:
if [ "$TAG" = "master" ]; then
TAG="latest"
fi
docker tag ghcr.io/garmin/${{ matrix.image }}:ci-test ghcr.io/garmin/${{ matrix.image }}:$TAG
docker push ghcr.io/garmin/${{ matrix.image }}:$TAG
docker tag ghcr.io/garmin/pyrex-${{ matrix.image }}:ci-test ghcr.io/garmin/pyrex-${{ matrix.image }}:$TAG
docker push ghcr.io/garmin/pyrex-${{ matrix.image }}:$TAG
if: ${{ ( github.ref == 'refs/heads/next' || github.ref == 'refs/heads/master' ) && github.event_name == 'push' && matrix.provider == 'docker' }}
4 changes: 2 additions & 2 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ To make a release of Pyrex:
For example, the `1.0.0` release would be tagged `v1.0.0`
4. Tagging the repository will trigger a new CI build. This build will
automatically push the container images to
[dockerhub](https://cloud.docker.com/u/garminpyrex/repository/list) using
the same tag that was created for the release. Verify that the
[ghcr](https://github.com/orgs/garmin/packages?repo_name=pyrex) using the
same tag that was created for the release. Verify that the
[Release build](https://github.com/garmin/pyrex/actions?query=workflow%3Arelease)
passes and the container images are pushed. In the unlikely event this
fails, delete the release, fix the issue, and try again. To manually deploy
Expand Down
2 changes: 1 addition & 1 deletion ci/build_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def main():
provider,
"build",
"-t",
"ghcr.io/garmin/%s:ci-test" % args.image,
"ghcr.io/garmin/pyrex-%s:ci-test" % args.image,
"-f",
docker_file,
"--network=host",
Expand Down
2 changes: 1 addition & 1 deletion ci/deploy_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def deploy_image(top_dir, image, tag):

(_, _, image_type) = image.split("-")

repo = "garmin/%s" % image
repo = "garmin/pyrex-%s" % image
name = "ghcr.io/%s:%s" % (repo, tag)

print("Deploying %s..." % name)
Expand Down
2 changes: 1 addition & 1 deletion pyrex.ini
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ confversion = @CONFVERSION@

# The name of the tag given to the image. If you want to keep around different
# Pyrex images simultaneously, each should have a unique tag
%tag = ghcr.io/garmin/${config:image}:${config:pyrextag}
%tag = ghcr.io/garmin/pyrex-${config:image}:${config:pyrextag}

# If set to 1, the image is built up locally every time the environment is
# sourced. If set to 0, building the image will be skipped, which means that
Expand Down

0 comments on commit 877b03e

Please sign in to comment.