From 2e288c1e7d0ac4f4c97c5a084afa1fba20195410 Mon Sep 17 00:00:00 2001
From: Water-Melon <melon-c@hotmail.com>
Date: Tue, 25 Jun 2024 10:36:53 +0000
Subject: [PATCH] debug2

---
 .github/workflows/test.yml          | 30 -----------------------------
 .github/workflows/version2_test.yml |  2 +-
 Dockerfile.deb                      |  8 +++++++-
 customize/packer.lua                |  1 -
 ubuntu/Dockerfile                   |  2 +-
 5 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 32bab57f..00000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Build & Test
-on: [push, pull_request]
-
-jobs:
-  test:
-    name: Build & Test
-    runs-on: ubuntu-20.04
-
-    strategy:
-      matrix:
-        image: [alpine, ubuntu, rhel]
-
-    env:
-      BASE: ${{ matrix.image }}
-      KONG_DOCKER_TAG: kong-${{ matrix.image }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build
-        run: |
-          make build
-      - name: Test
-        shell: 'script -q -e -c "bash {0}"'
-        run: |
-          make test
-      - name: Push RHEL
-        if: ${{ github.event_name == 'create' && github.event.ref_type == 'tag' }}
-        run: |
-          make release-rhel
diff --git a/.github/workflows/version2_test.yml b/.github/workflows/version2_test.yml
index fc8907c9..fc2020c2 100644
--- a/.github/workflows/version2_test.yml
+++ b/.github/workflows/version2_test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        package: [apk, deb, rpm]
+        package: [deb]
 
     env:
       BASE: ${{ matrix.package }}
diff --git a/Dockerfile.deb b/Dockerfile.deb
index 844f2de9..6d258808 100644
--- a/Dockerfile.deb
+++ b/Dockerfile.deb
@@ -25,7 +25,13 @@ RUN set -ex; \
       && echo "${KONG_SHA256}  /tmp/kong.deb" | sha256sum -c -; \
     fi \
     && apt-get update \
-    && apt-get install --yes /tmp/kong.deb \
+    && apt-get install --yes /tmp/kong.deb lua5.1 liblua5.1-dev unzip make \
+    && curl -L https://luarocks.org/releases/luarocks-3.8.0.tar.gz -o luarocks-3.8.0.tar.gz \
+    && tar zxpf luarocks-3.8.0.tar.gz \
+    && cd luarocks-3.8.0 \
+    && ./configure && make && make install \
+    && export PATH=$PATH:/usr/local/bin/luarocks \
+    && cd - \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/kong.deb \
     && chown kong:0 /usr/local/bin/kong \
diff --git a/customize/packer.lua b/customize/packer.lua
index 8e2a6557..6881624b 100644
--- a/customize/packer.lua
+++ b/customize/packer.lua
@@ -71,7 +71,6 @@ local platforms = {
       "apt install -y zip",
       "apt install -y wget",
       "apt install -y build-essential",
-      "apt install -y luarocks",
     },
   },
 }
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index aecc46d4..f9c97233 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex; \
     # Please update the ubuntu install docs if the below line is changed so that
     # end users can properly install Kong along with its required dependencies
     # and that our CI does not diverge from our docs.
-    && apt install --yes /tmp/kong.deb \
+    && apt install --yes /tmp/kong.deb luarocks\
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/kong.deb \
     && chown kong:0 /usr/local/bin/kong \