github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8534 from gabriel-samfira/fix-image-workflow

Browse Source 
Fix image workflow
This commit is contained in:
Derek McGowan 2023-05-22 19:20:36 -07:00 committed by GitHub
commit 65c7c92792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build-test-images.yml vendored
View File

@ -9,7 +9,7 @@ on:
azure_windows_image_id: azure_windows_image_id:
description: Windows image URN to deploy description: Windows image URN to deploy
required: true required: true
default: MicrosoftWindowsServer:WindowsServer:2022-datacenter:20348.350.2111030009 default: MicrosoftWindowsServer:WindowsServer:2022-datacenter:latest
azure_vm_size: azure_vm_size:
description: Windows image builder VM size description: Windows image builder VM size
required: true required: true
@ -144,7 +144,7 @@ jobs:
scp -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.PUBLIC_IP }}:/Users/azureuser/.docker/key.pem $HOME/.docker/key.pem scp -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.PUBLIC_IP }}:/Users/azureuser/.docker/key.pem $HOME/.docker/key.pem
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
uses: docker/login-action@v1 uses: docker/login-action@v2
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ github.actor }} username: ${{ github.actor }}

2
integration/images/volume-copy-up/Makefile
View File

@ -81,7 +81,7 @@ sub-container-%:
container: .container-${OS}-$(ARCH) container: .container-${OS}-$(ARCH)
.container-linux-$(ARCH): .container-linux-$(ARCH):
docker buildx build --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/${ARCH} \ docker buildx build --provenance=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/${ARCH} \
-t $(IMAGE)-${OS}-${ARCH} --build-arg BASE=${BASE} . -t $(IMAGE)-${OS}-${ARCH} --build-arg BASE=${BASE} .
.container-windows-$(ARCH): .container-windows-$(ARCH):

2
integration/images/volume-ownership/Makefile
View File

@ -87,7 +87,7 @@ sub-container-%:
container: .container-${OS}-$(ARCH) container: .container-${OS}-$(ARCH)
.container-linux-$(ARCH): .container-linux-$(ARCH):
docker buildx build --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/${ARCH} \ docker buildx build --provenance=false --pull --output=type=${OUTPUT_TYPE} --platform ${OS}/${ARCH} \
-t $(IMAGE)-${OS}-${ARCH} --build-arg BASE=${BASE} . -t $(IMAGE)-${OS}-${ARCH} --build-arg BASE=${BASE} .
.container-windows-$(ARCH): .container-windows-$(ARCH):