Rename the export image to linux, and now it can build the linux templates/editor.

This commit is contained in:
Relintai 2020-08-08 23:26:40 +02:00
parent 182b72f52d
commit b4ed80508a
4 changed files with 15 additions and 13 deletions

View File

@ -11,17 +11,18 @@ fi
project_root=$(pwd)/ project_root=$(pwd)/
img_version=bs img_version=bs
mkdir -p logs #mkdir -p logs
$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bew -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bewd -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bewd -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bw -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bw -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bwr -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-windows:${img_version} scons bwr -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-ubuntu-64:${img_version} scons bel -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bel -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-ubuntu-64:${img_version} scons beld -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons beld -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-ubuntu-64:${img_version} scons bl -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons bl -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-ubuntu-64:${img_version} scons blr -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-linux:${img_version} scons blr -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bj -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bj -j4
$podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bjr -j4 $podman run -v ${project_root}:/root/project -w /root/project godot-javascript:${img_version} scons bjr -j4

View File

@ -1,7 +0,0 @@
ARG img_version
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

View File

@ -0,0 +1,8 @@
ARG img_version
FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \
gcc-c++ 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 yasm
CMD /bin/bash

View File

@ -16,7 +16,7 @@ mkdir -p logs
export podman_build="$podman build --build-arg img_version=${img_version}" export podman_build="$podman build --build-arg img_version=${img_version}"
$podman build -v ${files_root}:/root/files -t godot-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log $podman build -v ${files_root}:/root/files -t godot-fedora:${img_version} -f Dockerfile.base . 2>&1 | tee logs/base.log
$podman_build -t godot-export:${img_version} -f Dockerfile.export . 2>&1 | tee logs/export.log $podman_build -t godot-linux:${img_version} -f Dockerfile.linux . 2>&1 | tee logs/linux.log
$podman_build -t godot-mono:${img_version} -f Dockerfile.mono . 2>&1 | tee logs/mono.log $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-mono-glue:${img_version} -f Dockerfile.mono-glue . 2>&1 | tee logs/mono-glue.log