From 195cd584bd2e5d81dda2005398102a96a34895dc Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Sat, 10 Feb 2024 08:41:10 -0500 Subject: [PATCH] Change to docker build Signed-off-by: Byron Ruth --- .github/workflows/preview.yaml | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 146cc1b..6a628d3 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -72,28 +72,19 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - # Setting up Docker Buildx with docker-container driver is required - # at the moment to be able to use a subdirectory with Git context. - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Setup builder - run: | - docker buildx create --name builder --bootstrap --use - - name: windowsservercore-1809 run: | - docker buildx build ` - --platform windows/amd64 ` + docker build ` --tag "${{ env.IMAGE_NAME }}:${{ github.ref_name }}-windowsservercore-1809" ` - --push ` ./2.10.x/windowsservercore-1809 + docker push "${{ env.IMAGE_NAME }}:${{ github.ref_name }}-windowsservercore-1809" + - name: nanoserver-1809 run: | - docker buildx build ` + docker build ` --build-arg "BASE_IMAGE=${{ env.IMAGE_NAME }}:${{ github.ref_name }}-nanoserver-1809" ` - --platform windows/amd64 ` --tag "${{ env.IMAGE_NAME }}:${{ github.ref_name }}-windowsservercore-1809" ` - --push ` ./2.10.x/nanoserver-1809 + + docker push "${{ env.IMAGE_NAME }}:${{ github.ref_name }}-nanoserver-1809"