From 763935569d4553c6d165b5d421b3aa765052e2fd Mon Sep 17 00:00:00 2001
From: dongli <jellylidong2nd@gmail.com>
Date: Thu, 26 Dec 2024 11:05:05 -0800
Subject: [PATCH 1/2] Refine Dockerfile for payment isolation

---
 apps/payment/Dockerfile | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/payment/Dockerfile b/apps/payment/Dockerfile
index 4d26368..dde06a2 100644
--- a/apps/payment/Dockerfile
+++ b/apps/payment/Dockerfile
@@ -1,26 +1,27 @@
 FROM python:3.10-slim-buster
 
 # docker settings
-ARG CONTAINER_APP_ROOT=
-ENV APP_NAME=
+ARG CONTAINER_APP_ROOT=/app
+ENV APP_NAME=payment
 
-ENV JWT_SECRET_KEY=""
+ENV JWT_SECRET_KEY="8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b"
+ENV JWT_ALGORITHM="HS256"
 
 #site_settings
 ENV SERVICE_API_ACCESS_HOST=0.0.0.0
 ENV SERVICE_API_ACCESS_PORT=8006
-ENV STRIPE_API_KEY=
-ENV STRIPE_WEBHOOK_SECRET=
-ENV MONGODB_NAME=
-ENV MONGODB_PORT=
-ENV MONGODB_URI=
+ENV STRIPE_API_KEY=sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd
+ENV STRIPE_WEBHOOK_SECRET=""
+ENV MONGODB_NAME=freeleaps2
+ENV MONGODB_PORT=27017
+ENV MONGODB_URI="mongodb://localhost:27017/"
 
 
 
 #log_settings
-ENV LOG_BASE_PATH=
-ENV BACKEND_LOG_FILE_NAME=
-ENV APPLICATION_ACTIVITY_LOG=
+ENV LOG_BASE_PATH=$CONTAINER_APP_ROOT/log/$APP_NAME
+ENV BACKEND_LOG_FILE_NAME=$APP_NAME
+ENV APPLICATION_ACTIVITY_LOG=$APP_NAME-activity
 
 
 WORKDIR ${CONTAINER_APP_ROOT}
@@ -31,9 +32,20 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . ${CONTAINER_APP_ROOT}
 
-RUN apt update
-RUN apt install -y netcat
-RUN ln -s /bin/bash /usr/bin/bash
+#RUN apt update
+#RUN apt install -y netcat
+#RUN ln -s /bin/bash /usr/bin/bash
+
+# Install tools and keyring updates
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gnupg wget && \
+    apt-get install -y debian-keyring debian-archive-keyring && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install additional tools and create symbolic links
+RUN apt-get update && apt-get install -y netcat && \
+    ln -s /bin/bash /usr/bin/bash && \
+    rm -rf /var/lib/apt/lists/*
 
 EXPOSE ${SERVICE_API_ACCESS_PORT}
 CMD ["uvicorn", "webapi.main:app", "--reload", "--port=${SERVICE_API_ACCESS_PORT}", "--host=${SERVICE_API_ACCESS_HOST}"]

From 1d8bbb2427d19f557337fc8b9924eccaca531ed4 Mon Sep 17 00:00:00 2001
From: dongli <jellylidong2nd@gmail.com>
Date: Fri, 27 Dec 2024 17:48:41 -0800
Subject: [PATCH 2/2] Refine Dockerfile for payment isolation

---
 apps/payment/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/payment/Dockerfile b/apps/payment/Dockerfile
index dde06a2..93fb585 100644
--- a/apps/payment/Dockerfile
+++ b/apps/payment/Dockerfile
@@ -11,7 +11,7 @@ ENV JWT_ALGORITHM="HS256"
 ENV SERVICE_API_ACCESS_HOST=0.0.0.0
 ENV SERVICE_API_ACCESS_PORT=8006
 ENV STRIPE_API_KEY=sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd
-ENV STRIPE_WEBHOOK_SECRET=""
+ENV STRIPE_WEBHOOK_SECRET=whsec_S6ZWjSAdR5Cpsn2USH6ZRBqbdBIENjTC
 ENV MONGODB_NAME=freeleaps2
 ENV MONGODB_PORT=27017
 ENV MONGODB_URI="mongodb://localhost:27017/"