From 5ec56ac0ab30183782bc60c556b397f9f67a8009 Mon Sep 17 00:00:00 2001 From: badPointer Date: Sat, 7 Oct 2023 12:43:00 +0000 Subject: [PATCH] chore: hot --- Dockerfile | 8 +++----- Dockerfile.debian | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a333bae..6bcbefa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,14 +18,12 @@ # This image is intended to be used as a base for projects using ncc. # -# Build-time args/envs -ENV GENERIC_BUILD_PATH=/tmp/ncc_build - +# Build-time args ARG PHP_VERSION=8.2 - # Builder stage: downloads necessary files and serves them on a silver platter. FROM php:{PHP_VERSION}-fpm AS builder +ENV GENERIC_BUILD_PATH=/tmp/ncc_build WORKDIR /tmp # Install some stuff the default image doesn't come with @@ -57,7 +55,7 @@ LABEL description="ncc's official Docker image" ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # Copy downloaded files -COPY --from=builder ${GENERIC_BUILD_PATH}/. . +COPY --from=builder /tmp/ncc_build/. . # Install some stuff the default image doesn't come with RUN apk update && \ diff --git a/Dockerfile.debian b/Dockerfile.debian index 73d9da4..7147f6e 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -18,14 +18,12 @@ # This image is intended to be used as a base for projects using ncc. # -# Build-time args/envs -ENV GENERIC_BUILD_PATH=/tmp/ncc_build - +# Build-time args ARG PHP_VERSION=8.2 - # Builder stage: downloads necessary files and serves them on a silver platter. FROM php:{PHP_VERSION}-fpm AS builder +ENV GENERIC_BUILD_PATH=/tmp/ncc_build WORKDIR /tmp # Install some stuff the default image doesn't come with @@ -57,7 +55,7 @@ LABEL description="ncc's official Docker image" ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ # Copy downloaded files -COPY --from=builder ${GENERIC_BUILD_PATH}/. . +COPY --from=builder /tmp/ncc_build/. . # Install some stuff the default image doesn't come with RUN apt-get update -yqq && \