mirror of
https://github.com/MatthewL246/pretendo-docker.git
synced 2026-08-27 21:34:03 -05:00
Rename some account server patches, misc small changes
This commit is contained in:
@@ -5,5 +5,5 @@ PN_ACT_CONFIG_MONGO_CONNECTION_STRING=mongodb://mongodb:27017/pretendo_account?r
|
||||
PN_ACT_CONFIG_MONGOOSE_OPTION_useNewUrlParser=true
|
||||
PN_ACT_CONFIG_MONGOOSE_OPTION_useUnifiedTopology=true
|
||||
PN_ACT_CONFIG_S3_ENDPOINT=http://minio:9000
|
||||
PN_ACT_CONFIG_CDN_BASE_URL=https://account-cdn.pretendo.cc
|
||||
PN_ACT_CONFIG_CDN_BASE_URL=https://cdn.pretendo.cc
|
||||
PN_ACT_CONFIG_GRPC_PORT=5000
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
FROM nginx:mainline-alpine
|
||||
|
||||
RUN rm /etc/nginx/conf.d/default.conf
|
||||
COPY * /etc/nginx/conf.d/
|
||||
|
||||
EXPOSE 80 443
|
||||
@@ -1,9 +0,0 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name account.pretendo.cc;
|
||||
|
||||
location / {
|
||||
proxy_pass http://account:8080;
|
||||
proxy_set_header Host $host;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
diff --git i/docker/entrypoint.sh w/docker/entrypoint.sh
|
||||
index 2c6aa02..c9d3234 100644
|
||||
index 2c6aa02..c3c375e 100644
|
||||
--- i/docker/entrypoint.sh
|
||||
+++ w/docker/entrypoint.sh
|
||||
@@ -25,4 +25,4 @@ for file in $keys; do
|
||||
@@ -25,4 +15,4 @@ for file in $keys; do
|
||||
fi
|
||||
done
|
||||
|
||||
-exec node src/server.js
|
||||
+exec node dist/server.js
|
||||
+exec node --inspect=0.0.0.0:9229 dist/server.js
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git i/docker/entrypoint.sh w/docker/entrypoint.sh
|
||||
index 2c6aa02..b8c8d5a 100644
|
||||
index 2c6aa02..c3c375e 100644
|
||||
--- i/docker/entrypoint.sh
|
||||
+++ w/docker/entrypoint.sh
|
||||
@@ -1,15 +1,5 @@
|
||||
|
||||
15
patches/account/tsconfig-generate-sourcemap.patch
Normal file
15
patches/account/tsconfig-generate-sourcemap.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
diff --git i/tsconfig.json w/tsconfig.json
|
||||
index cdef6fa..de41d36 100644
|
||||
--- i/tsconfig.json
|
||||
+++ w/tsconfig.json
|
||||
@@ -16,7 +16,8 @@
|
||||
"typeRoots": [
|
||||
"node_modules/@types",
|
||||
"node_modules/@hcaptcha"
|
||||
- ]
|
||||
+ ],
|
||||
+ "sourceMap": true,
|
||||
},
|
||||
"include": ["src"]
|
||||
}
|
||||
\ No newline at end of file
|
||||
@@ -20,6 +20,7 @@ for dir in "$git_base/patches/"*; do
|
||||
for patch in "$git_base/patches/$subdir"/*; do
|
||||
echo "Applying patch $patch..."
|
||||
git apply "$patch" -v
|
||||
git add .
|
||||
num_patches=$((num_patches + 1))
|
||||
done
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user