feat(apisix): finalize initial package structure and cleanup source files\n\n- Moved packaged files to CloudronPackages/APISIX/\n- Removed temporary apisix-source directory from CloudronPackages/APISIX/\n\n🤖 Generated with Gemini CLI\nCo-Authored-By: Gemini <noreply@google.com>

CloudronPackages/APISIX/Dockerfile

@@ -1,58 +1,35 @@
-FROM cloudron/base:4.2.0 AS build
+FROM apache/apisix:3.6.0-debian
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV ENV_INST_LUADIR=/usr/local/apisix
-
-COPY apisix-source /apisix
-
-WORKDIR /apisix
-
-RUN set -x \
-    && apt-get -y update --fix-missing \
-    && apt-get install -y \
-        make \
-        git  \
-        sudo \
-        libyaml-dev \
-        libldap2-dev \
-    && make deps \
-    && mkdir -p ${ENV_INST_LUADIR} \
-    && cp -r deps ${ENV_INST_LUADIR} \
-    && make install
-
-FROM cloudron/base:4.2.0
-
-# Install the runtime libyaml package
-RUN apt-get -y update --fix-missing \
-    && apt-get install -y libyaml-0-2 \
-    && apt-get remove --purge --auto-remove -y \
-    && mkdir -p /usr/local/apisix/ui
-
-COPY --from=build /usr/local/apisix /usr/local/apisix
-COPY --from=build /usr/local/openresty /usr/local/openresty
-COPY --from=build /usr/bin/apisix /usr/bin/apisix
-# Assuming UI files are in apisix-source/ui, adjust if needed
-
-
-# Install brotli (from upstream install-brotli.sh)
+# Install additional tools needed for Cloudron
 RUN apt-get update && apt-get install -y \
-    libbrotli-dev \
+    curl \
+    wget \
     --no-install-recommends && \
     rm -rf /var/lib/apt/lists/*
 
-ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
+# Set up directory structure following Cloudron conventions
+RUN mkdir -p /app/code /app/data
 
-WORKDIR /usr/local/apisix
+# Copy APISIX to Cloudron app directory
+RUN cp -r /usr/local/apisix/* /app/code/ && \
+    cp -r /usr/bin/apisix /app/code/
 
-RUN ln -sf /dev/stdout /usr/local/apisix/logs/access.log \
-    && ln -sf /dev/stderr /usr/local/apisix/logs/error.log
+# Copy configuration template
+COPY config.yaml /app/code/conf/config.yaml
 
+# Copy start script
+COPY start.sh /app/code/start.sh
+RUN chmod +x /app/code/start.sh
+
+# Set proper permissions
+RUN chown -R cloudron:cloudron /app/code /app/data
+
+# Configure working directory and user
+WORKDIR /app/code
+USER cloudron
+
+# Expose ports
 EXPOSE 9080 9443
 
-# Copy our custom start.sh
-COPY start.sh /usr/local/bin/start.sh
-RUN chmod +x /usr/local/bin/start.sh
-
-ENTRYPOINT ["/usr/local/bin/start.sh"]
-
-STOPSIGNAL SIGQUIT
+# Start the application
+CMD ["/app/code/start.sh"]