Merge pull request #19 from godotengine/cmd-bash

akien-mga · web-flow · commit 81cb1623c9ac · 2019-11-18T21:54:16.000+01:00
Use /bin/bash as default CMD, log container build output
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@
 *.dmg
 *.zip
 *.xip
+
+logs/
diff --git a/Dockerfile.android b/Dockerfile.android
@@ -31,4 +31,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
     cd .. && \
     rm -rf /root/mono /root/godot-mono-builds
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.export b/Dockerfile.export
@@ -4,4 +4,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \
       xorg-x11-server-Xvfb mesa-dri-drivers libXcursor libXinerama libXrandr libXi alsa-lib pulseaudio-libs java-1.8.0-openjdk-devel && \
     dnf clean all
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.ios b/Dockerfile.ios
@@ -20,4 +20,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \
 
 ENV OSXCROSS_IOS=not_nothing
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.javascript b/Dockerfile.javascript
@@ -26,4 +26,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
     cd .. && \
     rm -rf /root/mono /root/godot-mono-builds
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.mono b/Dockerfile.mono
@@ -19,3 +19,5 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
                       https://download.mono-project.com/repo/centos8-stable/m/msbuild/msbuild-sdkresolver-16.0+xamarinxplat.2018.09.26.17.53-0.xamarin.5.epel8.noarch.rpm \
                       https://download.mono-project.com/repo/centos8-stable/n/nuget/nuget-4.7.0.5148.bin-0.xamarin.2.epel8.noarch.rpm && \
     rm -rf /root/mono
+
+CMD /bin/bash
diff --git a/Dockerfile.mono-glue b/Dockerfile.mono-glue
@@ -6,4 +6,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \
       xorg-x11-server-Xvfb libX11-devel libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel alsa-lib-devel pulseaudio-libs-devel libudev-devel mesa-libGL-devel mesa-libGLU-devel mesa-dri-drivers && \
     dnf clean all
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.msvc b/Dockerfile.msvc
@@ -25,4 +25,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     rm -rf /root/.wine/drive_c/users/root/Temp/* && \
     rm -rf /root/.cache
     
-CMD /usr/bin/bash
+CMD /bin/bash
diff --git a/Dockerfile.osx b/Dockerfile.osx
@@ -62,4 +62,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
 ENV MONO64_PREFIX=/root/dependencies/mono
 ENV OSXCROSS_ROOT=/root/osxcross
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.ubuntu-32 b/Dockerfile.ubuntu-32
@@ -40,4 +40,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
     rm *.deb && \
     rm -rf /root/mono
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.ubuntu-64 b/Dockerfile.ubuntu-64
@@ -40,4 +40,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
     rm *.deb && \
     rm -rf /root/mono
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.windows b/Dockerfile.windows
@@ -41,4 +41,4 @@ RUN git clone https://github.com/mono/mono --branch mono-${mono_version} --singl
 ENV MONO32_PREFIX=/root/dependencies/mono-32
 ENV MONO64_PREFIX=/root/dependencies/mono-64
 
-CMD ['/bin/bash']
+CMD /bin/bash
diff --git a/Dockerfile.xcode b/Dockerfile.xcode
@@ -36,4 +36,3 @@ CMD mkdir -p /root/xcode && \
     cp -r Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 /tmp/iPhoneOS12.4.sdk/usr/include/c++ && \
     cd /tmp && \
     tar -cJf /root/files/iPhoneSimulator12.4.sdk.tar.xz iPhoneOS12.4.sdk
-
diff --git a/build.sh b/build.sh
@@ -14,26 +14,28 @@ fi
 
 if [ -z "$1" ]; then
   echo "usage: $0 <mono version"
-  echo 
+  echo
   echo "For example: $0 5.16.0.220"
   echo
   exit 1
 fi
 
 mono_version=$1
 
-$podman build -t godot-fedora:latest -f Dockerfile.base .
-$podman build -t godot-export:latest -f Dockerfile.export .
+mkdir -p logs
+
+$podman build -t godot-fedora:latest -f Dockerfile.base . 2>&1 | tee logs/base.log
+$podman build -t godot-export:latest -f Dockerfile.export . 2>&1 | tee logs/export.log
 
-$podman build --build-arg mono_version=${mono_version} -t godot-mono:${mono_version} -f Dockerfile.mono .
-$podman build --build-arg mono_version=${mono_version} -t godot-mono-glue:latest -f Dockerfile.mono-glue .
-$podman build --build-arg mono_version=${mono_version} -v $(pwd)/files:/root/files -t godot-windows:latest -f Dockerfile.windows .
-$podman build --build-arg mono_version=${mono_version} -t godot-ubuntu-32:latest -f Dockerfile.ubuntu-32 .
-$podman build --build-arg mono_version=${mono_version} -t godot-ubuntu-64:latest -f Dockerfile.ubuntu-64 .
-$podman build --build-arg mono_version=${mono_version} -t godot-android:latest -f Dockerfile.android .
-$podman build --build-arg mono_version=${mono_version} -t godot-javascript:latest -f Dockerfile.javascript .
+$podman build --build-arg mono_version=${mono_version} -t godot-mono:${mono_version} -f Dockerfile.mono . 2>&1 | tee logs/mono.log
+$podman build --build-arg mono_version=${mono_version} -t godot-mono-glue:latest -f Dockerfile.mono-glue . 2>&1 | tee logs/mono-glue.log
+$podman build --build-arg mono_version=${mono_version} -v $(pwd)/files:/root/files -t godot-windows:latest -f Dockerfile.windows . 2>&1 | tee logs/windows.log
+$podman build --build-arg mono_version=${mono_version} -t godot-ubuntu-64:latest -f Dockerfile.ubuntu-64 . 2>&1 | tee logs/ubuntu-64.log
+$podman build --build-arg mono_version=${mono_version} -t godot-ubuntu-32:latest -f Dockerfile.ubuntu-32 . 2>&1 | tee logs/ubuntu-32.log
+$podman build --build-arg mono_version=${mono_version} -t godot-android:latest -f Dockerfile.android . 2>&1 | tee logs/android.log
+$podman build --build-arg mono_version=${mono_version} -t godot-javascript:latest -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log
 
-$podman build -t godot-xcode-packer:latest -f Dockerfile.xcode -v $(pwd)/files:/root/files .
+$podman build -t godot-xcode-packer:latest -f Dockerfile.xcode -v $(pwd)/files:/root/files . 2>&1 | tee logs/xcode.log
 
 if [ ! -e files/MacOSX10.14.sdk.tar.xz ] || [ ! -e files/iPhoneOS12.4.sdk.tar.xz ] || [ ! -e files/iPhoneSimulator12.4.sdk.tar.xz ]; then
   if [ ! -e files/Xcode_10.3.xip ]; then
@@ -42,14 +44,14 @@ if [ ! -e files/MacOSX10.14.sdk.tar.xz ] || [ ! -e files/iPhoneOS12.4.sdk.tar.xz
   fi
 
   echo "Building OSX and iOS SDK packages. This will take a while"
-  $podman run -it --rm -v $(pwd)/files:/root/files godot-xcode-packer:latest
+  $podman run -it --rm -v $(pwd)/files:/root/files godot-xcode-packer:latest 2>&1 | tee logs/xcode_packer.log
 fi
 
-$podman build -t godot-ios:latest -f Dockerfile.ios -v $(pwd)/files:/root/files .
-$podman build --build-arg mono_version=${mono_version} -t godot-osx:latest -f Dockerfile.osx -v $(pwd)/files:/root/files .
+$podman build -t godot-ios:latest -f Dockerfile.ios -v $(pwd)/files:/root/files . 2>&1 | tee logs/ios.log
+$podman build --build-arg mono_version=${mono_version} -t godot-osx:latest -f Dockerfile.osx -v $(pwd)/files:/root/files . 2>&1 | tee logs/osx.log
 
 if [ ! -e files/msvc2017.tar ]; then
-  echo 
+  echo
   echo "files/msvc2017.tar is missing. This file can be created on a Windows 7 or 10 machine by downloading the 'Visual Studio Tools' installer."
   echo "here: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2017"
   echo "The required components can be installed by running"
@@ -60,4 +62,4 @@ if [ ! -e files/msvc2017.tar ]; then
   exit 1
 fi
 
-$podman build -t godot-msvc:latest -f Dockerfile.msvc -v $(pwd)/files:/root/files .
+$podman build -t godot-msvc:latest -f Dockerfile.msvc -v $(pwd)/files:/root/files . 2>&1 | tee logs/msvc.log

-Original file line number
+Diff line change
 *.dmg
 *.zip
 *.xip
++
 +logs/
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \`
`20`	`20`
`21`	`21`	`ENV OSXCROSS_IOS=not_nothing`
`22`	`22`
`23`		`-CMD ['/bin/bash']`
	`23`	`+CMD /bin/bash`