debug 2

QPod · Apr 12, 2024 · 039349d · 039349d
1 parent c8cac9c
commit 039349d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/docker_casdoor/Dockerfile b/docker_casdoor/Dockerfile
@@ -14,4 +14,6 @@ FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
 COPY --from=builder /opt/casdoor /opt/casdoor
 COPY work/app.conf /opt/casdoor/conf/app.conf
 LABEL maintainer="haobibo@gmail.com"
+ENV RUNNING_IN_DOCKER true
+WORKDIR /opt/casdoor
 EXPOSE 8000
diff --git a/docker_casdoor/README.md b/docker_casdoor/README.md
@@ -7,4 +7,9 @@ docker build -t qpod0dev/casdoor \
     -f docker_casdoor/Dockerfile \
     --build-arg="BASE_NAMESPACE=qpod0dev" \
     docker_casdoor
+
+docker run -it \
+    -p 8000:8000 \
+    qpod0dev/casdoor \
+    bash
 ```
diff --git a/docker_casdoor/demo/docker-compose.yml b/docker_casdoor/demo/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       container_name: db-postgres
       environment:
         POSTGRES_DB: casdoor
-        POSTGRES_USER: pg-casdoor-username
-        POSTGRES_PASSWORD: pg-casdoor-password
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: postgres
 
   svc-casdoor:
       # image: qpod0dev/casdoor
@@ -23,9 +23,9 @@ services:
         /bin/bash -l -c '
         ls -alh /opt/casdoor
         echo "driverName = postgres" >> /opt/casdoor/conf/app.conf
-        echo "dataSourceName = \"user=pg-casdoor-username password=pg-casdoor-password host=db-postgres port=5432 sslmode=disable dbname=casdoor\"" >> /opt/casdoor/conf/app.conf
-        
-        /opt/casdoor/server --createDatabase=true
+        echo "dataSourceName = \"user=postgres  password=postgres  host=db-postgres port=5432 sslmode=disable dbname=casdoor\"" >> /opt/casdoor/conf/app.conf
+        sleep 8s
+        # /opt/casdoor/server --createDatabase=true
         '
       environment:
         RUNNING_IN_DOCKER: "true"