Compare commits

...

7 commits

Author SHA1 Message Date
TomP101
154c34a4d7
Merge d8f2bdb1a1 into 2aa53f929d 2025-03-05 09:24:08 +00:00
TomP101
d8f2bdb1a1
Update main.yml 2025-03-05 10:24:05 +01:00
TomP101
8e279057f5
Update main.yml 2025-03-05 10:23:25 +01:00
TomP101
e0d5682f10
Update main.yml 2025-03-05 10:05:10 +01:00
TomP101
c4fa9761de
Update main.yml 2025-03-05 09:51:16 +01:00
TomP101
2c0601e951
Update README.md 2025-03-05 09:41:14 +01:00
TomP101
dbb361571b
Update main.yml 2025-03-05 09:40:35 +01:00
2 changed files with 5 additions and 6 deletions

View file

@ -51,14 +51,14 @@ jobs:
build_image:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
runs-on: self-hosted
needs: build
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Registry (mr)
run: echo ${{ secrets.REGISTRY_PASS }} | docker login mr:8084 -u ${{ secrets.REGISTRY_USER }} --password-stdin
run: docker login mr:8084 -u ${{ vars.REGISTRY_USER }} -p ${{ vars.REGISTRY_PASS }}
- name: Extract Short SHA
id: vars
run: echo "::set-output name=short_sha::$(echo $GITHUB_SHA | cut -c1-7)"
@ -69,14 +69,13 @@ jobs:
build_image_main:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
needs: build
runs-on: self-hosted
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Registry (main)
run: echo ${{ secrets.REGISTRY_PASS }} | docker login main:8083 -u ${{ secrets.REGISTRY_USER }} --password-stdin
run: docker login main:8083 -u ${{ vars.REGISTRY_USER }} -p ${{ vars.REGISTRY_PASS }}
- 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
## TESTMESSAGE asdasdasda
[See the presentation here](https://speakerdeck.com/michaelisvy/spring-petclinic-sample-application)