diff --git a/tools/build-containers/Dockerfile.ubuntu-32 b/tools/build-containers/Dockerfile.ubuntu-32 deleted file mode 100644 index 9fae2e4d..00000000 --- a/tools/build-containers/Dockerfile.ubuntu-32 +++ /dev/null @@ -1,22 +0,0 @@ -FROM i386/ubuntu:trusty - -ARG mono_version - -RUN apt-get update && \ - apt-get -y install wget && \ - 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 - && \ - echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main' >> /etc/apt/sources.list && \ - echo 'deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main' >> /etc/apt/sources.list && \ - apt-get -y update && \ - apt-get -y install --no-install-recommends \ - autoconf automake bzip2 cmake curl gettext git libtool make perl scons xz-utils \ - gcc-8 g++-8 libudev-dev libx11-dev libxcursor-dev libxrandr-dev libasound2-dev libpulse-dev \ - libgl1-mesa-dev libglu1-mesa-dev libxi-dev libxinerama-dev yasm && \ - ln -sf /usr/bin/gcc-ranlib-8 /usr/bin/gcc-ranlib && \ - ln -sf /usr/bin/gcc-ar-8 /usr/bin/gcc-ar && \ - ln -sf /usr/bin/gcc-8 /usr/bin/gcc && \ - ln -sf /usr/bin/g++-8 /usr/bin/g++ - -CMD /bin/bash diff --git a/tools/build-containers/Dockerfile.ubuntu-64 b/tools/build-containers/Dockerfile.ubuntu-64 deleted file mode 100644 index 18dd1a8d..00000000 --- a/tools/build-containers/Dockerfile.ubuntu-64 +++ /dev/null @@ -1,20 +0,0 @@ -FROM ubuntu:trusty - -RUN apt-get update && \ - apt-get -y install wget && \ - 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 - && \ - echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main' >> /etc/apt/sources.list && \ - echo 'deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu trusty main' >> /etc/apt/sources.list && \ - apt-get -y update && \ - apt-get -y install --no-install-recommends \ - autoconf automake bzip2 cmake curl gettext git libtool make perl scons xz-utils \ - gcc-8 g++-8 libudev-dev libx11-dev libxcursor-dev libxrandr-dev libasound2-dev libpulse-dev \ - libgl1-mesa-dev libglu1-mesa-dev libxi-dev libxinerama-dev yasm && \ - ln -sf /usr/bin/gcc-ranlib-8 /usr/bin/gcc-ranlib && \ - ln -sf /usr/bin/gcc-ar-8 /usr/bin/gcc-ar && \ - ln -sf /usr/bin/gcc-8 /usr/bin/gcc && \ - ln -sf /usr/bin/g++-8 /usr/bin/g++ - -CMD /bin/bash diff --git a/tools/build-containers/build_containers.sh b/tools/build-containers/build_containers.sh index b50c1346..c55139ba 100755 --- a/tools/build-containers/build_containers.sh +++ b/tools/build-containers/build_containers.sh @@ -21,8 +21,8 @@ $podman_build -t godot-export:${img_version} -f Dockerfile.export . 2>&1 | tee l $podman_build -t godot-mono:${img_version} -f Dockerfile.mono . 2>&1 | tee logs/mono.log $podman_build -t godot-mono-glue:${img_version} -f Dockerfile.mono-glue . 2>&1 | tee logs/mono-glue.log $podman_build -t godot-windows:${img_version} -f Dockerfile.windows --ulimit nofile=65536 . 2>&1 | tee logs/windows.log -$podman_build -t godot-ubuntu-64:${img_version} -f Dockerfile.ubuntu-64 . 2>&1 | tee logs/ubuntu-64.log -$podman_build -t godot-ubuntu-32:${img_version} -f Dockerfile.ubuntu-32 . 2>&1 | tee logs/ubuntu-32.log +#$podman_build -t godot-ubuntu-64:${img_version} -f Dockerfile.ubuntu-64 . 2>&1 | tee logs/ubuntu-64.log +#$podman_build -t godot-ubuntu-32:${img_version} -f Dockerfile.ubuntu-32 . 2>&1 | tee logs/ubuntu-32.log $podman_build -t godot-javascript:${img_version} -f Dockerfile.javascript . 2>&1 | tee logs/javascript.log $podman_build -t godot-android:${img_version} -f Dockerfile.android . 2>&1 | tee logs/android.log