Fix docker build (#14737)

OrchardCMS · Nov 22, 2023 · 261a069 · 261a069
1 parent fa2a9b2
commit 261a069
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -67,7 +67,7 @@ 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 build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:dev .
+        docker build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:dev .
         docker push orchardproject/orchardcore-cms-linux:dev
     - name: Deploy preview docker image for windows
       if: matrix.os == 'windows-latest'

diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -78,7 +78,7 @@ 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 build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} .
+        docker build -f Dockerfile-CI --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 }}"
     - name: Deploy preview docker image for windows

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-ARG TARGETOS=linux
-FROM --platform=$TARGETOS golang:alpine AS build
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETOS
 
 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
 LABEL stage=build-env

diff --git a/Dockerfile-CI b/Dockerfile-CI
@@ -1,7 +1,7 @@
 # This Docker file is intended for the CI
 # A prerequisite is a published application in the .build/release  
-ARG TARGETOS=linux
-FROM --platform=$TARGETOS golang:alpine AS build
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETOS
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
 FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux