From a3adc0c123ca72b02692bc5d4105e6a447435276 Mon Sep 17 00:00:00 2001
From: Wangchong Zhou <fffonion@gmail.com>
Date: Fri, 15 Dec 2023 16:45:43 +0800
Subject: [PATCH] Revert "fix(*) only mount logs directory and use a different
 prefix (#474)"

This reverts commit 8660faf97712e1d33dfc31dc0f67c05ab906bae6.
---
 assets/docker-compose-linux-extend.yml    |  6 ------
 assets/docker-compose-nonlinux-extend.yml |  6 ------
 assets/pongo_entrypoint.sh                | 11 ++++++-----
 pongo.sh                                  |  8 --------
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 assets/docker-compose-linux-extend.yml
 delete mode 100644 assets/docker-compose-nonlinux-extend.yml

diff --git a/assets/docker-compose-linux-extend.yml b/assets/docker-compose-linux-extend.yml
deleted file mode 100644
index 96659672..00000000
--- a/assets/docker-compose-linux-extend.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: '3.5'
-
-services:
-  kong:
-    volumes:
-      - ${PONGO_WD}/servroot:/kong-prefix
diff --git a/assets/docker-compose-nonlinux-extend.yml b/assets/docker-compose-nonlinux-extend.yml
deleted file mode 100644
index b50d7c50..00000000
--- a/assets/docker-compose-nonlinux-extend.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: '3.5'
-
-services:
-  kong:
-    volumes:
-      - ${PONGO_WD}/servroot/logs:/kong-prefix/logs
diff --git a/assets/pongo_entrypoint.sh b/assets/pongo_entrypoint.sh
index 6eb95e07..3f73f9b6 100755
--- a/assets/pongo_entrypoint.sh
+++ b/assets/pongo_entrypoint.sh
@@ -62,7 +62,8 @@ if [ -z "$KONG_DNS_RESOLVER" ]; then
   fi
 fi
 
-export KONG_PREFIX=/kong-prefix
+# set working dir in mounted volume to be able to check the logs
+export KONG_PREFIX=/kong-plugin/servroot
 
 # set debug logs; specifically for the 'shell' command, tests already have it
 export KONG_LOG_LEVEL=debug
@@ -105,14 +106,14 @@ fi
 
 # Modify the 'kong' user to match the ownership of the mounted plugin folder
 # Kong will not start because of permission errors if it cannot write to the
-# /kong-prefix folder (which created by volume mount /kong-prefix/logs by root).
+# /kong-plugin/servroot folder (which resides on the mount).
 # Since those permissions are controlled by the host, we update the 'kong' user
 # inside the container to match the UID and GID.
-if [ -d /kong-prefix ]; then
+if [ -d /kong-plugin ]; then
   KONG_UID=$(id -u kong)
   KONG_GID=$(id -g kong)
-  MOUNT_UID=$(stat -c "%u" /kong-prefix)
-  MOUNT_GID=$(stat -c "%g" /kong-prefix)
+  MOUNT_UID=$(stat -c "%u" /kong-plugin)
+  MOUNT_GID=$(stat -c "%g" /kong-plugin)
   if [ ! "$KONG_GID" = "$MOUNT_GID" ]; then
     # change KONG_GID to the ID of the folder owner group
     groupmod -g "$MOUNT_GID" --non-unique kong
diff --git a/pongo.sh b/pongo.sh
index 4a476b9c..27625326 100755
--- a/pongo.sh
+++ b/pongo.sh
@@ -25,14 +25,6 @@ function globals {
 
   DOCKER_FILE=${PONGO_DOCKER_FILE:-$LOCAL_PATH/assets/Dockerfile}
   DOCKER_COMPOSE_FILES="-f ${LOCAL_PATH}/assets/docker-compose.yml"
-  # macOS or WSL working on a drvfs mount doesn't support named pipes or Unix Domain Socket
-  if [ "$(uname -s)" == "Darwin" ] || ! (rm -f .pongo_test.sock; mkfifo .pongo_test.sock) 2>/dev/null; then
-    rm -f .pongo_test.sock
-    DOCKER_COMPOSE_FILES="$DOCKER_COMPOSE_FILES -f ${LOCAL_PATH}/assets/docker-compose-nonlinux-extend.yml"
-  else
-    DOCKER_COMPOSE_FILES="$DOCKER_COMPOSE_FILES -f ${LOCAL_PATH}/assets/docker-compose-linux-extend.yml"
-  fi
-
   IMAGE_BASE_NAME=kong-pongo-test
 
   # the path where the plugin source is located, as seen from Pongo (this script)