Fixed formatting issues.
This commit is contained in:
@@ -58,54 +58,54 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
REGISTRY: ${{ secrets.REGISTRY_HOST }}
|
REGISTRY: ${{ secrets.REGISTRY_HOST }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set image variables
|
- name: Set image variables
|
||||||
id: vars
|
id: vars
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
OWNER_LC="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
|
OWNER_LC="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
|
||||||
SHA_SHORT="$(echo "${{ github.sha }}" | cut -c1-7)"
|
SHA_SHORT="$(echo "${{ github.sha }}" | cut -c1-7)"
|
||||||
echo "owner_lc=$OWNER_LC" >> "$GITHUB_OUTPUT"
|
echo "owner_lc=$OWNER_LC" >> "$GITHUB_OUTPUT"
|
||||||
echo "sha_short=$SHA_SHORT" >> "$GITHUB_OUTPUT"
|
echo "sha_short=$SHA_SHORT" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
- name: Docker login
|
- name: Docker login
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" \
|
echo "${{ secrets.REGISTRY_PASSWORD }}" \
|
||||||
| docker login "${{ env.REGISTRY }}" \
|
| docker login "${{ env.REGISTRY }}" \
|
||||||
-u "${{ secrets.REGISTRY_USER }}" \
|
-u "${{ secrets.REGISTRY_USER }}" \
|
||||||
--password-stdin
|
--password-stdin
|
||||||
|
|
||||||
- name: Enable BuildKit
|
- name: Enable BuildKit
|
||||||
run: echo "DOCKER_BUILDKIT=1" >> $GITHUB_ENV
|
run: echo "DOCKER_BUILDKIT=1" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Build API image
|
- name: Build API image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
-f JSMR.Api/Dockerfile \
|
-f JSMR.Api/Dockerfile \
|
||||||
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}" \
|
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}" \
|
||||||
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main" \
|
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main" \
|
||||||
.
|
.
|
||||||
|
|
||||||
- name: Push API image
|
- name: Push API image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}"
|
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:${{ steps.vars.outputs.sha_short }}"
|
||||||
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main"
|
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-api:main"
|
||||||
|
|
||||||
- name: Build Web image
|
- name: Build Web image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
docker build \
|
docker build \
|
||||||
-f JSMR.UI.Blazor/Dockerfile \
|
-f JSMR.UI.Blazor/Dockerfile \
|
||||||
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}" \
|
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}" \
|
||||||
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main" \
|
-t "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main" \
|
||||||
.
|
.
|
||||||
|
|
||||||
- name: Push Web image
|
- name: Push Web image
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}"
|
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:${{ steps.vars.outputs.sha_short }}"
|
||||||
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main"
|
docker push "${{ env.REGISTRY }}/${{ steps.vars.outputs.owner_lc }}/jsmr-web:main"
|
||||||
Reference in New Issue
Block a user