test
This commit is contained in:
parent
d36889a9d9
commit
0b0141a7d9
|
|
@ -159,45 +159,40 @@ jobs:
|
||||||
echo "PR_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${pr_tag}" >> "$GITHUB_ENV"
|
echo "PR_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${pr_tag}" >> "$GITHUB_ENV"
|
||||||
echo "prTag=${pr_tag}" >> $GITHUB_OUTPUT
|
echo "prTag=${pr_tag}" >> $GITHUB_OUTPUT
|
||||||
echo "betaTag=${beta_tag}" >> $GITHUB_OUTPUT
|
echo "betaTag=${beta_tag}" >> $GITHUB_OUTPUT
|
||||||
|
echo "${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${pr_tag}" > /tmp/output.txt
|
||||||
|
cat /tmp/output.txt
|
||||||
|
|
||||||
- name: Docker Build
|
# - name: Docker Build
|
||||||
run: |
|
# run: |
|
||||||
make docker
|
# make docker
|
||||||
|
|
||||||
- name: Docker login
|
# - name: Docker login
|
||||||
run: |
|
# run: |
|
||||||
docker login --username '${{ secrets.DOCKER_USER }}' --password '${{ secrets.DOCKER_PSWD }}' '${{ secrets.DOCKER_REPO }}'
|
# docker login --username '${{ secrets.DOCKER_USER }}' --password '${{ secrets.DOCKER_PSWD }}' '${{ secrets.DOCKER_REPO }}'
|
||||||
|
|
||||||
- name: Docker tag
|
# - name: Docker tag
|
||||||
run: |
|
# run: |
|
||||||
docker tag '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.PR_IMAGE }}
|
# docker tag '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.PR_IMAGE }}
|
||||||
|
|
||||||
- name: PR Image Docker Push
|
# - name: PR Image Docker Push
|
||||||
#if: github.event_name == 'pull_request'
|
# #if: github.event_name == 'pull_request'
|
||||||
run: |
|
# run: |
|
||||||
docker push ${{ env.PR_IMAGE }}
|
# docker push ${{ env.PR_IMAGE }}
|
||||||
|
|
||||||
- name: Docker Push
|
# - name: Docker Push
|
||||||
if: github.ref == 'refs/heads/edi-foundation-integration'
|
# if: github.ref == 'refs/heads/edi-foundation-integration'
|
||||||
run: |
|
# run: |
|
||||||
docker tag ${{ env.PR_IMAGE }} ${{ env.CI_IMAGE }}
|
# docker tag ${{ env.PR_IMAGE }} ${{ env.CI_IMAGE }}
|
||||||
docker push ${{ env.CI_IMAGE }}
|
# docker push ${{ env.CI_IMAGE }}
|
||||||
|
|
||||||
- name: PR Image Artifact
|
|
||||||
#if: github.event_name == 'pull_request'
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: ${{ env.PR_IMAGE }}
|
|
||||||
path: /tmp/output1.txt
|
|
||||||
if-no-files-found: error
|
|
||||||
|
|
||||||
- name: CI Image Artifact
|
# - name: CI Image Artifact
|
||||||
if: github.ref == 'refs/heads/edi-foundation-integration'
|
# if: github.ref == 'refs/heads/edi-foundation-integration'
|
||||||
uses: actions/upload-artifact@v2
|
# uses: actions/upload-artifact@v2
|
||||||
with:
|
# with:
|
||||||
name: ${{ env.CI_IMAGE }}
|
# name: ${{ env.CI_IMAGE }}
|
||||||
path: /tmp/output2.txt
|
# path: /tmp/output.txt
|
||||||
if-no-files-found: error
|
# if-no-files-found: error
|
||||||
|
|
||||||
# Blackduck:
|
# Blackduck:
|
||||||
# needs: [Build]
|
# needs: [Build]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue