From 419e20226bda5c0b4c6476f5464812661d07db2a Mon Sep 17 00:00:00 2001
From: Muhamad Aditya Prima <aprimediet@gmail.com>
Date: Fri, 27 Dec 2024 14:05:53 +0700
Subject: [PATCH] Updated builder setup

---
 7/Dockerfile.alpine-builder |  2 +-
 7/scripts/alpine-setup.sh   | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/7/Dockerfile.alpine-builder b/7/Dockerfile.alpine-builder
index 9ad1121..f7b32ec 100644
--- a/7/Dockerfile.alpine-builder
+++ b/7/Dockerfile.alpine-builder
@@ -3,7 +3,7 @@
 # PHP 7.4 == 3.15
 ARG OS_VERSION=3.15
 
-FROM quay.io/sindigilive/alpine:${OS_VERSION} AS builder
+FROM quay.io/sindigilive/alpine:${OS_VERSION}
 LABEL maintainer="<Muhamad Aditya Prima> map@sindigilive.com"
 
 ARG WITH_APACHE=false
diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh
index 8e36604..8271934 100644
--- a/7/scripts/alpine-setup.sh
+++ b/7/scripts/alpine-setup.sh
@@ -15,15 +15,13 @@ SERVER_ROOT="/app"
 APP_ROOT="$SERVER_ROOT/htdocs"
 LOG_LEVEL="info"
 
-if [ "$FLAVOR" == "full" ] then
-    for i in $(echo $PHP_LIST | tr "," "\n"); do
-        PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i ";
-    done
+for i in $(echo $PHP_LIST | tr "," "\n"); do
+    PHP_DEPS="${PHP_DEPS} php$PHP_VER_SHORT-$i ";
+done
 
 /sbin/apk add --update --no-cache $PHP_DEPS;
-fi
 
-# Only setup apache with full flavor parameters
+# Setup apache2
 if [ "$WITH_APACHE" == "true" ]; then
     /usr/sbin/addgroup -g 10001 apache ;
     /usr/sbin/adduser -D -u 10001 -G apache -s /bin/sh -h $APP_ROOT apache ;