Skip to content

Commit

Permalink
Hadolint recommendations
Browse files Browse the repository at this point in the history
  • Loading branch information
TokisanGames committed Mar 25, 2020
1 parent 5914b9f commit e6b220d
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 33 deletions.
6 changes: 4 additions & 2 deletions Dockerfile.android
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ FROM godot-mono:${img_version}

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
dnf -y install --setopt=install_weak_deps=False \
gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \
mkdir sdk && cd sdk && \
Expand Down Expand Up @@ -31,4 +33,4 @@ RUN cp -a /root/files/${mono_version} /root && \
cd /root && \
rm -rf /root/${mono_version} /root/godot-mono-builds

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ RUN dnf -y upgrade --setopt=install_weak_deps=False && \
dnf -y install --setopt=install_weak_deps=False \
bash bzip2 curl git make patch pkgconfig python3 scons unzip which xz

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.export
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ FROM godot-fedora:${img_version}
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

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.ios
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \

ENV OSXCROSS_IOS=not_nothing

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.javascript
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ RUN cp -a /root/files/${mono_version} /root && \
cd /root && \
rm -rf /root/${mono_version} /root/godot-mono-builds

CMD /bin/bash
CMD ["/bin/bash"]
4 changes: 2 additions & 2 deletions Dockerfile.mono
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM godot-fedora:${img_version}

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
dnf -y install --setopt=install_weak_deps=False \
autoconf automake cmake gcc gcc-c++ gettext libtool perl python && \
cp -a /root/files/${mono_version} /root && \
Expand All @@ -21,4 +21,4 @@ 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.3+xamarinxplat.2019.08.08.00.55-0.xamarin.2.epel8.noarch.rpm \
https://download.mono-project.com/repo/centos8-stable/n/nuget/nuget-5.2.0.6090.bin-0.xamarin.1.epel8.noarch.rpm

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.mono-glue
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ ARG mono_version
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

CMD /bin/bash
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion Dockerfile.msvc
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ RUN dnf -y install --setopt=install_weak_deps=False \
rm -rf /root/.wine/drive_c/users/root/Temp/* && \
rm -rf /root/.cache

CMD /bin/bash
CMD ["/bin/bash"]
4 changes: 2 additions & 2 deletions Dockerfile.osx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM godot-mono:${img_version}

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
dnf -y install --setopt=install_weak_deps=False \
automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm && \
git clone --progress https://github.com/tpoechtrager/osxcross.git && \
Expand Down Expand Up @@ -43,4 +43,4 @@ RUN cp -a /root/files/${mono_version} /root && \
cp /root/files/mono-config-macosx /root/dependencies/mono/etc/mono/config && \
rm -rf /root/${mono_version}

CMD /bin/bash
CMD ["/bin/bash"]
18 changes: 10 additions & 8 deletions Dockerfile.ubuntu-32
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ FROM i386/ubuntu:trusty

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
apt-get update && \
apt-get -y install wget && \
apt-get -y install wget --no-install-recommends && \
cd /root && \
wget -O- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F' | apt-key add - && \
wget -O- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8E51A6D660CD88D67D65221D90BD7EACED8E640A' | apt-key add - && \
Expand All @@ -18,7 +20,9 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
ln -sf /usr/bin/gcc-ranlib-9 /usr/bin/gcc-ranlib && \
ln -sf /usr/bin/gcc-ar-9 /usr/bin/gcc-ar && \
ln -sf /usr/bin/gcc-9 /usr/bin/gcc && \
ln -sf /usr/bin/g++-9 /usr/bin/g++
ln -sf /usr/bin/g++-9 /usr/bin/g++ && \
apt-get clean && \
rm -rf /var/lib/apt/lists/

RUN cp -a /root/files/${mono_version} /root && \
cd /root/${mono_version} && \
Expand All @@ -33,11 +37,9 @@ RUN cp -a /root/files/${mono_version} /root && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/c/core-setup/msbuild-libhostfxr_3.0.0.2019.04.16.02.13-0xamarin3+ubuntu1604b1_i386.deb && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild-sdkresolver_16.3+xamarinxplat.2019.08.08.00.55-0xamarin2+ubuntu1604b1_all.deb && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/n/nuget/nuget_5.2.0.6090.bin-0xamarin1+ubuntu1604b1_all.deb && \
dpkg -i --force-all *.deb && \
dpkg -i --force-all ./*.deb && \
sed -i '/Depends.*mono/d' /var/lib/dpkg/status && \
ln -s /usr/bin/mono /usr/bin/cli && \
apt-get clean && \
rm -rf /var/lib/apt/lists/ && \
rm *.deb
rm -f ./*.deb

CMD /bin/bash
CMD ["/bin/bash"]
18 changes: 10 additions & 8 deletions Dockerfile.ubuntu-64
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ FROM ubuntu:trusty

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN if [ -z "${mono_version}" ]; then printf "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
apt-get update && \
apt-get -y install wget && \
apt-get -y install wget --no-install-recommends && \
cd /root && \
wget -O- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F' | apt-key add - && \
wget -O- 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8E51A6D660CD88D67D65221D90BD7EACED8E640A' | apt-key add - && \
Expand All @@ -18,7 +20,9 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
ln -sf /usr/bin/gcc-ranlib-9 /usr/bin/gcc-ranlib && \
ln -sf /usr/bin/gcc-ar-9 /usr/bin/gcc-ar && \
ln -sf /usr/bin/gcc-9 /usr/bin/gcc && \
ln -sf /usr/bin/g++-9 /usr/bin/g++
ln -sf /usr/bin/g++-9 /usr/bin/g++ && \
apt-get clean && \
rm -rf /var/lib/apt/lists/

RUN cp -a /root/files/${mono_version} /root && \
cd /root/${mono_version} && \
Expand All @@ -33,11 +37,9 @@ RUN cp -a /root/files/${mono_version} /root && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/c/core-setup/msbuild-libhostfxr_3.0.0.2019.04.16.02.13-0xamarin3+ubuntu1604b1_amd64.deb && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/m/msbuild/msbuild-sdkresolver_16.3+xamarinxplat.2019.08.08.00.55-0xamarin2+ubuntu1604b1_all.deb && \
wget https://download.mono-project.com/repo/ubuntu/pool/main/n/nuget/nuget_5.2.0.6090.bin-0xamarin1+ubuntu1604b1_all.deb && \
dpkg -i --force-all *.deb && \
dpkg -i --force-all ./*.deb && \
sed -i '/Depends.*mono/d' /var/lib/dpkg/status && \
ln -s /usr/bin/mono /usr/bin/cli && \
apt-get clean && \
rm -rf /var/lib/apt/lists/ && \
rm *.deb
rm -f ./*.deb

CMD /bin/bash
CMD ["/bin/bash"]
4 changes: 2 additions & 2 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM godot-mono:${img_version}

ARG mono_version

RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
RUN if [ -z "${mono_version}" ]; then "\n\nArgument mono_version is mandatory!\n\n"; exit 1; fi && \
dnf -y install --setopt=install_weak_deps=False \
mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static yasm wine && \
cp -a /root/files/${mono_version} /root && \
Expand All @@ -28,4 +28,4 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
cp -rvp /etc/mono /root/dependencies/mono-32/etc && \
dnf -y remove wine

CMD /bin/bash
CMD ["/bin/bash"]
9 changes: 6 additions & 3 deletions Dockerfile.xcode
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM godot-fedora:${img_version}

SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN dnf -y install --setopt=install_weak_deps=False \
autoconf automake libtool clang cmake fuse fuse-devel libxml2-devel libicu-devel compat-openssl10-devel bzip2-devel kmod cpio && \
git clone --progress https://github.com/mackyle/xar.git && \
Expand All @@ -11,9 +13,8 @@ RUN dnf -y install --setopt=install_weak_deps=False \
git clone --progress https://github.com/NiklasRosenstein/pbzx && \
cd pbzx && \
git checkout 2a4d7c3300c826d918def713a24d25c237c8ed53 && \
clang -O3 -llzma -lxar -I /usr/local/include pbzx.c -o pbzx

CMD mkdir -p /root/xcode && \
clang -O3 -llzma -lxar -I /usr/local/include pbzx.c -o pbzx && \
mkdir -p /root/xcode && \
cd /root/xcode && \
xar -xf /root/files/Xcode_10.3.xip && \
/root/pbzx/pbzx -n Content | cpio -i && \
Expand All @@ -40,3 +41,5 @@ 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

CMD ["/bin/bash"]

0 comments on commit e6b220d

Please sign in to comment.