Docker Build and Push (#14855)

OrchardCMS · Dec 7, 2023 · 57efd47 · 57efd47
1 parent b89abee
commit 57efd47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git 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
@@ -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 .