From 6f0cae4575bf6f44b118c501f48bbb48355ea64d Mon Sep 17 00:00:00 2001 From: jtkech Date: Thu, 7 Dec 2023 16:42:20 +0100 Subject: [PATCH] Docker Build and Push --- .github/workflows/preview_ci.yml | 8 ++------ .github/workflows/release_ci.yml | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index 37683c471a7..708a7a1c21c 100644 --- a/.github/workflows/preview_ci.yml +++ b/.github/workflows/preview_ci.yml @@ -70,9 +70,5 @@ jobs: Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false $output = [System.IO.Path]::GetFullPath("./.build/release") dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0 - docker buildx build -f Dockerfile-CI --platform=linux/amd64 . - docker buildx build -f Dockerfile-CI --load --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:dev . - docker push orchardproject/orchardcore-cms-linux:dev - docker buildx build -f Dockerfile-CI --platform=windows/amd64 . - docker buildx build -f Dockerfile-CI --load --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:dev . - docker push orchardproject/orchardcore-cms-windows:dev + docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:dev --push . + docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:dev --push . diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index d41772ac845..4e91ce444e4 100644 --- a/.github/workflows/release_ci.yml +++ b/.github/workflows/release_ci.yml @@ -81,11 +81,5 @@ jobs: Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false $output = [System.IO.Path]::GetFullPath("./.build/release") dotnet publish -c Release --property:PublishDir=$output --no-build --framework net8.0 - docker buildx build -f Dockerfile-CI --platform=linux/amd64 . - docker buildx build -f Dockerfile-CI --load --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} . - docker push orchardproject/orchardcore-cms-linux:latest - docker push "orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }}" - docker buildx build -f Dockerfile-CI --platform=windows/amd64 . - docker buildx build -f Dockerfile-CI --load --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} . - docker push orchardproject/orchardcore-cms-windows:latest - docker push "orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }}" + docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} --push . + docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} --push .