The windows, javascript, android, and osx containers now extend the base fedora container.

This commit is contained in:
Relintai 2020-08-08 23:40:58 +02:00
parent b4ed80508a
commit c0c3728358
4 changed files with 5 additions and 9 deletions

View File

@ -1,5 +1,5 @@
ARG img_version
FROM godot-mono:${img_version}
FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \
gcc gcc-c++ java-1.8.0-openjdk-devel ncurses-compat-libs && \

View File

@ -1,10 +1,8 @@
ARG img_version
FROM godot-mono:${img_version}
ARG mono_version
FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \
java-openjdk yasm && \
gcc gcc-c++ java-openjdk yasm && \
git clone --progress https://github.com/emscripten-core/emsdk && \
cd emsdk && \
git checkout a5082b232617c762cb65832429f896c838df2483 && \

View File

@ -1,7 +1,5 @@
ARG img_version
FROM godot-mono:${img_version}
ARG mono_version
FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \
automake autoconf bzip2-devel clang libicu-devel libtool libxml2-devel llvm-devel openssl-devel yasm && \

View File

@ -1,5 +1,5 @@
ARG img_version
FROM godot-mono:${img_version}
FROM godot-fedora:${img_version}
RUN dnf -y install --setopt=install_weak_deps=False \
mingw32-gcc mingw32-gcc-c++ mingw32-winpthreads-static mingw64-gcc mingw64-gcc-c++ mingw64-winpthreads-static