Skip to content

Commit dc5ced8

Browse files
committed
Try docker auth action and split container name variable
1 parent c648d2d commit dc5ced8

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

.github/workflows/release.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,25 @@ jobs:
2929
git tag -a $REL_TAG -m "${REL_TAG}"
3030
git push origin $REL_TAG
3131
working-directory: ${{runner.workspace}}/hpc-resource-provisioner
32+
- name: Authenticate with ghcr
33+
uses: docker/[email protected]
34+
with:
35+
registry: ghcr.io
36+
username: ${{ github.actor }}
37+
password: ${{ secrets.GHCR_TOKEN }}
38+
- name: Authenticate with docker-hub
39+
uses: docker/[email protected]
40+
with:
41+
username: ${{ inputs.BBPBUILDBOT_DOCKERHUB_USER }}
42+
password: ${{ secrets.BBPBUILDBOT_DOCKERHUB_PASSWORD }}
3243
- name: Build and push container
33-
env:
34-
BBPBUILDBOT_DOCKERHUB_PASSWORD: ${{ secrets.BBPBUILDBOT_DOCKERHUB_PASSWORD }}
35-
GHCR_USER: ${{ secrets.GHCR_USER }}
36-
GHCR_TOKEN: ${{ secrets.GHCR_TOKEN}}
3744
run: |
3845
SOURCE_CHECKSUM=$(find hpc_provisioner -type f -exec sha256sum {} \; | sha256sum | awk '{print $1}')
39-
IMAGE_NAME=ghcr.io/openbraininstitute/hpc-resource-provisioner
40-
docker build --label "org.opencontainers.image.checksum=${SOURCE_CHECKSUM}" --label "org.opencontainers.image.software_version=${REL_TAG}" -t ${IMAGE_NAME}:${REL_TAG} .
41-
docker image tag ${IMAGE_NAME}:${REL_TAG} ${IMAGE_NAME}:latest
42-
echo ${GHCR_TOKEN} | docker login ghcr.io -u ${GHCR_USER} --password-stdin
43-
docker push ${IMAGE_NAME}:${REL_TAG}
44-
docker push ${IMAGE_NAME}:latest
46+
GHCR_PATH=openbraininstitute/hpc-resource-provisioner
47+
docker build --label "org.opencontainers.image.checksum=${SOURCE_CHECKSUM}" --label "org.opencontainers.image.software_version=${REL_TAG}" -t ghcr.io/${GHCR_PATH}:${REL_TAG} .
48+
docker image tag ghcr.io/${GHCR_PATH}:${REL_TAG} ghcr.io/${GHCR_PATH}:latest
49+
docker push ghcr.io/${GHCR_PATH}:${REL_TAG}
50+
docker push ghcr.io/${GHCR_PATH}:latest
4551
working-directory: ${{runner.workspace}}/hpc-resource-provisioner
4652
- name: Release
4753
uses: softprops/action-gh-release@v2

hpc_provisioner/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "hpc_provisioner"
7-
version = "0.5.10.0.dev"
7+
version = "0.5.10.0.dev0"
88
dependencies = [
99
"aws-parallelcluster",
1010
"boto3",

0 commit comments

Comments
 (0)