Changes
This commit is contained in:
parent
b85b495644
commit
75d7a978a7
8
.github/workflows/base-build-image.yml
vendored
8
.github/workflows/base-build-image.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
|||||||
- id: get-id
|
- id: get-id
|
||||||
name: Get a unique tag for this build
|
name: Get a unique tag for this build
|
||||||
run: |
|
run: |
|
||||||
echo "DOCKER_IMAGE=${{ vars.docker_repo2_registry }}/${{ github.repository }}:${{ inputs.image_tag }}" >> "$GITHUB_OUTPUT";
|
echo "DOCKER_IMAGE=${{ secrets.docker_repo2_registry }}/${{ github.repository }}:${{ inputs.image_tag }}" >> "$GITHUB_OUTPUT";
|
||||||
|
|
||||||
- name: Print image name
|
- name: Print image name
|
||||||
run: |
|
run: |
|
||||||
@ -28,9 +28,9 @@ jobs:
|
|||||||
# if: ${{ github.event_name == 'push' }}
|
# if: ${{ github.event_name == 'push' }}
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ${{ vars.docker_repo2_registry }}
|
registry: ${{ secrets.docker_repo2_registry }}
|
||||||
username: ${{ vars.docker_repo2_username }}
|
username: ${{ secrets.docker_repo2_username }}
|
||||||
password: ${{ vars.docker_repo2_password }}
|
password: ${{ secrets.docker_repo2_password }}
|
||||||
|
|
||||||
- name: Build and push the Docker image
|
- name: Build and push the Docker image
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.github/workflows/push-image-scan.yml
vendored
2
.github/workflows/push-image-scan.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
SHA=${{ github.sha }}; BRANCH_NAME=${{ github.base_ref || github.ref_name }};
|
SHA=${{ github.sha }}; BRANCH_NAME=${{ github.base_ref || github.ref_name }};
|
||||||
BUILD_ID=$BRANCH_NAME-${SHA:0:8};
|
BUILD_ID=$BRANCH_NAME-${SHA:0:8};
|
||||||
DOCKER_IMAGE=${{ vars.docker_repo2_registry }}/$REPO:$BUILD_ID;
|
DOCKER_IMAGE=${{ secrets.docker_repo2_registry }}/$REPO:$BUILD_ID;
|
||||||
echo "BUILD_ID=$BUILD_ID" >> "$GITHUB_OUTPUT";
|
echo "BUILD_ID=$BUILD_ID" >> "$GITHUB_OUTPUT";
|
||||||
echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> "$GITHUB_OUTPUT";
|
echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> "$GITHUB_OUTPUT";
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user