From a63bb29e54f27f7b4a7fa91c69d60b54cbc41481 Mon Sep 17 00:00:00 2001 From: larry kirschner Date: Tue, 24 Aug 2021 17:04:12 -0700 Subject: [PATCH] impr: switch to mentorpal docker account from uscictdocker (#53) --- .github/workflows/test-and-publish.yml | 16 ++++++++-------- README.md | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml index 878b0d3..8bfef5b 100644 --- a/.github/workflows/test-and-publish.yml +++ b/.github/workflows/test-and-publish.yml @@ -57,20 +57,20 @@ jobs: - name: docker login run: docker login -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWORD }} - name: docker build classifier - run: cd mentor_classifier && DOCKER_IMAGE=uscictdocker/mentor-classifier:${{ steps.tag.outputs.image_tag }} make docker-build + run: cd mentor_classifier && DOCKER_IMAGE=mentorpal/mentor-classifier:${{ steps.tag.outputs.image_tag }} make docker-build - name: docker build api - run: cd mentor_classifier_api && DOCKER_IMAGE=uscictdocker/mentor-classifier-api:${{ steps.tag.outputs.image_tag }} make docker-build + run: cd mentor_classifier_api && DOCKER_IMAGE=mentorpal/mentor-classifier-api:${{ steps.tag.outputs.image_tag }} make docker-build - name: docker tag release as version if: needs.publish-check.outputs.is_release == 'true' run: | - docker tag "uscictdocker/mentor-classifier:${{ steps.tag.outputs.image_tag }}" "uscictdocker/mentor-classifier:${GITHUB_REF#refs/tags/}" - docker tag "uscictdocker/mentor-classifier-api:${{ steps.tag.outputs.image_tag }}" "uscictdocker/mentor-classifier-api:${GITHUB_REF#refs/tags/}" + docker tag "mentorpal/mentor-classifier:${{ steps.tag.outputs.image_tag }}" "mentorpal/mentor-classifier:${GITHUB_REF#refs/tags/}" + docker tag "mentorpal/mentor-classifier-api:${{ steps.tag.outputs.image_tag }}" "mentorpal/mentor-classifier-api:${GITHUB_REF#refs/tags/}" - name: docker tag main as latest if: github.ref == 'refs/heads/main' run: | - docker tag "uscictdocker/mentor-classifier:${{ steps.tag.outputs.image_tag }}" "uscictdocker/mentor-classifier:latest" - docker tag "uscictdocker/mentor-classifier-api:${{ steps.tag.outputs.image_tag }}" "uscictdocker/mentor-classifier-api:latest" + docker tag "mentorpal/mentor-classifier:${{ steps.tag.outputs.image_tag }}" "mentorpal/mentor-classifier:latest" + docker tag "mentorpal/mentor-classifier-api:${{ steps.tag.outputs.image_tag }}" "mentorpal/mentor-classifier-api:latest" - name: docker push classifier - run: docker push --all-tags uscictdocker/mentor-classifier + run: docker push --all-tags mentorpal/mentor-classifier - name: docker push api - run: docker push --all-tags uscictdocker/mentor-classifier-api + run: docker push --all-tags mentorpal/mentor-classifier-api diff --git a/README.md b/README.md index da42f90..136fb33 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,13 @@ To build/push a work-in-progress tag of `mentor-classifier` for the current comm To build/push a pre-release semver tag of `mentor-classifier` for the current commit in your branch - create a [github release](https://github.com/ICTLearningSciences/mentor-classifier/releases/new) **from your development branch** with tag format `/^\d+\.\d+\.\d+(-[a-z\d\-.]+)?$/` (e.g. `1.0.0-alpha.1`) -- this will create a tag like `uscictdocker/mentor-classifier:1.0.0-alpha.1` +- this will create a tag like `mentorpal/mentor-classifier:1.0.0-alpha.1` - you can follow progress in [github actions](https://github.com/mentor/mentor-classifier/actions) Once your changes are approved and merged to main, you should create a release tag in semver format as follows: - create a [github release](https://github.com/ICTLearningSciences/mentor-classifier/releases/new) **from main** with tag format `/^\d+\.\d+\.\d$/` (e.g. `1.0.0`) -- this will create a tag like `uscictdocker/mentor-classifier:1.0.0` +- this will create a tag like `mentorpal/mentor-classifier:1.0.0` - you can follow progress in [github actions](https://github.com/mentor/mentor-classifier/actions)