Skip to content

Commit

Permalink
tools: improve Dockerfile syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
rr- committed Aug 18, 2024
1 parent 72ffca9 commit 5383569
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions tools/docker/game-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# artifacts (binaries, includes etc.) from previous stages and installs all the
# tools necessary to build TR1X.

FROM ubuntu:latest as base
FROM ubuntu:latest AS base

# don't prompt during potential installation/update of tzinfo
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -36,9 +36,9 @@ RUN cd pcre2 \
FROM base AS backtrace
RUN apt-get install -y git gcc autoconf libtool
RUN git clone https://github.com/LostArtefacts/libbacktrace/
RUN cd libbacktrace && \
autoreconf -fi && \
./configure \
RUN cd libbacktrace \
&& autoreconf -fi \
&& ./configure \
--prefix=/ext/ \
&& make -j 4 \
&& make install
Expand Down
10 changes: 5 additions & 5 deletions tools/docker/game-win/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# tools necessary to build TR1X.

# MinGW
FROM ubuntu:latest as mingw
FROM ubuntu:latest AS mingw

# don't prompt during potential installation/update of tzinfo
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -23,7 +23,7 @@ RUN apt-get update \


# pcre
FROM mingw as pcre2
FROM mingw AS pcre2
RUN git clone https://github.com/PCRE2Project/pcre2
RUN apt-get -y install libtool
RUN cd pcre2 \
Expand All @@ -36,7 +36,7 @@ RUN cd pcre2 \


# zlib
FROM mingw as zlib
FROM mingw AS zlib
RUN git clone https://github.com/madler/zlib
RUN cd zlib \
&& make -f win32/Makefile.gcc \
Expand All @@ -49,7 +49,7 @@ RUN cd zlib \


# libav
FROM mingw as libav
FROM mingw AS libav
RUN apt-get install -y \
nasm
RUN git clone \
Expand All @@ -76,7 +76,7 @@ RUN cd FFmpeg \


# SDL
FROM mingw as sdl
FROM mingw AS sdl
RUN git clone https://github.com/libsdl-org/SDL -b SDL2
RUN apt-get install -y automake
RUN cd SDL \
Expand Down

0 comments on commit 5383569

Please sign in to comment.