Compare commits

..

1 commit

Author SHA1 Message Date
TomP101
6936b4dd57
Merge 1f436abce1 into 2aa53f929d 2025-03-04 13:42:49 +00:00
2 changed files with 6 additions and 5 deletions

View file

@ -51,14 +51,14 @@ jobs:
build_image:
if: github.event_name == 'pull_request'
runs-on: self-hosted
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Registry (mr)
run: docker login mr:8084 -u ${{ vars.REGISTRY_USER }} -p ${{ vars.REGISTRY_PASS }}
run: echo ${{ secrets.REGISTRY_PASS }} | docker login mr:8084 -u ${{ secrets.REGISTRY_USER }} --password-stdin
- name: Extract Short SHA
id: vars
run: echo "::set-output name=short_sha::$(echo $GITHUB_SHA | cut -c1-7)"
@ -69,13 +69,14 @@ jobs:
build_image_main:
if: github.ref == 'refs/heads/main'
runs-on: self-hosted
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Registry (main)
run: docker login main:8083 -u ${{ vars.REGISTRY_USER }} -p ${{ vars.REGISTRY_PASS }}
run: echo ${{ secrets.REGISTRY_PASS }} | docker login main:8083 -u ${{ secrets.REGISTRY_USER }} --password-stdin
- name: Extract Short SHA
id: vars
run: echo "::set-output name=short_sha::$(echo $GITHUB_SHA | cut -c1-7)"

View file

@ -5,7 +5,7 @@
## Understanding the Spring Petclinic application with a few diagrams
## TESTMESSAGE asdasdasda
## TESTMESSAGE
[See the presentation here](https://speakerdeck.com/michaelisvy/spring-petclinic-sample-application)