Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tools: improve Dockerfile syntax

Browse source
This commit is contained in:
Marcin Kurczewski 2024-08-18 23:02:00 +02:00
parent 72ffca9edf
commit 5383569ba2
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/docker/game-linux/Dockerfile
View file

@ -5,7 +5,7 @@
# artifacts (binaries, includes etc.) from previous stages and installs all the # artifacts (binaries, includes etc.) from previous stages and installs all the
# tools necessary to build TR1X. # tools necessary to build TR1X.
FROM ubuntu:latest as base FROM ubuntu:latest AS base
# don't prompt during potential installation/update of tzinfo # don't prompt during potential installation/update of tzinfo
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -36,9 +36,9 @@ RUN cd pcre2 \
FROM base AS backtrace FROM base AS backtrace
RUN apt-get install -y git gcc autoconf libtool RUN apt-get install -y git gcc autoconf libtool
RUN git clone https://github.com/LostArtefacts/libbacktrace/ RUN git clone https://github.com/LostArtefacts/libbacktrace/
RUN cd libbacktrace && \ RUN cd libbacktrace \
autoreconf -fi && \ && autoreconf -fi \
./configure \ && ./configure \
--prefix=/ext/ \ --prefix=/ext/ \
&& make -j 4 \ && make -j 4 \
&& make install && make install

10
tools/docker/game-win/Dockerfile
View file

@ -6,7 +6,7 @@
# tools necessary to build TR1X. # tools necessary to build TR1X.
# MinGW # MinGW
FROM ubuntu:latest as mingw FROM ubuntu:latest AS mingw
# don't prompt during potential installation/update of tzinfo # don't prompt during potential installation/update of tzinfo
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -23,7 +23,7 @@ RUN apt-get update \
# pcre # pcre
FROM mingw as pcre2 FROM mingw AS pcre2
RUN git clone https://github.com/PCRE2Project/pcre2 RUN git clone https://github.com/PCRE2Project/pcre2
RUN apt-get -y install libtool RUN apt-get -y install libtool
RUN cd pcre2 \ RUN cd pcre2 \
@ -36,7 +36,7 @@ RUN cd pcre2 \
# zlib # zlib
FROM mingw as zlib FROM mingw AS zlib
RUN git clone https://github.com/madler/zlib RUN git clone https://github.com/madler/zlib
RUN cd zlib \ RUN cd zlib \
&& make -f win32/Makefile.gcc \ && make -f win32/Makefile.gcc \
@ -49,7 +49,7 @@ RUN cd zlib \
# libav # libav
FROM mingw as libav FROM mingw AS libav
RUN apt-get install -y \ RUN apt-get install -y \
nasm nasm
RUN git clone \ RUN git clone \
@ -76,7 +76,7 @@ RUN cd FFmpeg \
# SDL # SDL
FROM mingw as sdl FROM mingw AS sdl
RUN git clone https://github.com/libsdl-org/SDL -b SDL2 RUN git clone https://github.com/libsdl-org/SDL -b SDL2
RUN apt-get install -y automake RUN apt-get install -y automake
RUN cd SDL \ RUN cd SDL \