From b4ed80508aecc5ba4a9600d1ca88238ca006b939 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Sat, 8 Aug 2020 23:26:40 +0200
Subject: [PATCH] Rename the export image to linux, and now it can build the
 linux templates/editor.

---
 podman_build_all.sh                        | 11 ++++++-----
 tools/build-containers/Dockerfile.export   |  7 -------
 tools/build-containers/Dockerfile.linux    |  8 ++++++++
 tools/build-containers/build_containers.sh |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 tools/build-containers/Dockerfile.export
 create mode 100644 tools/build-containers/Dockerfile.linux

diff --git a/podman_build_all.sh b/podman_build_all.sh
index a46e7612..9a9457d5 100755
--- a/podman_build_all.sh
+++ b/podman_build_all.sh
@@ -11,17 +11,18 @@ fi
 project_root=$(pwd)/
 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 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 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-ubuntu-64:${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-ubuntu-64:${img_version} scons blr -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-linux:${img_version} scons beld -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-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 bjr -j4
diff --git a/tools/build-containers/Dockerfile.export b/tools/build-containers/Dockerfile.export
deleted file mode 100644
index 6add3bb1..00000000
--- a/tools/build-containers/Dockerfile.export
+++ /dev/null
@@ -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
diff --git a/tools/build-containers/Dockerfile.linux b/tools/build-containers/Dockerfile.linux
new file mode 100644
index 00000000..3c0ef6de
--- /dev/null
+++ b/tools/build-containers/Dockerfile.linux
@@ -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
diff --git a/tools/build-containers/build_containers.sh b/tools/build-containers/build_containers.sh
index c55139ba..b0a9a759 100755
--- a/tools/build-containers/build_containers.sh
+++ b/tools/build-containers/build_containers.sh
@@ -16,7 +16,7 @@ mkdir -p logs
 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 -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-glue:${img_version} -f Dockerfile.mono-glue . 2>&1 | tee logs/mono-glue.log