From ea637132bd194244ed868f728659febe81a92474 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 25 Mar 2020 19:36:41 +0000
Subject: [PATCH] named layers

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 869cabd7..5462c8db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # "Build" shimmie (composer install - done in its own stage so that we don't
 # need to include all the composer fluff in the final image)
-FROM debian:stable-slim
+FROM debian:stable-slim AS app
 RUN apt update && apt install -y composer php7.3-gd php7.3-dom php7.3-sqlite3 imagemagick
 COPY composer.json composer.lock /app/
 WORKDIR /app
@@ -15,7 +15,7 @@ RUN [ $RUN_TESTS = false ] || (\
     echo '=== Cleaning ===' && rm -rf data)
 
 # Build su-exec so that our final image can be nicer
-FROM debian:stable-slim
+FROM debian:stable-slim AS suexec
 RUN  apt-get update && apt-get install -y --no-install-recommends gcc libc-dev curl
 RUN  curl -k -o /usr/local/bin/su-exec.c https://raw.githubusercontent.com/ncopa/su-exec/master/su-exec.c; \
      gcc -Wall /usr/local/bin/su-exec.c -o/usr/local/bin/su-exec; \
@@ -32,8 +32,8 @@ RUN apt update && apt install -y curl \
     php7.3-cli php7.3-gd php7.3-pgsql php7.3-mysql php7.3-sqlite3 php7.3-zip php7.3-dom php7.3-mbstring php-xdebug \
     composer imagemagick vim zip unzip && \
     rm -rf /var/lib/apt/lists/*
-COPY --from=0 /app /app
-COPY --from=1 /usr/local/bin/su-exec /usr/local/bin/su-exec
+COPY --from=app /app /app
+COPY --from=suexec /usr/local/bin/su-exec /usr/local/bin/su-exec
 
 WORKDIR /app
 CMD ["/bin/sh", "/app/tests/docker-init.sh"]