diff --git a/environment/account.env b/environment/account.env index fc94ed1..6e3e5cf 100644 --- a/environment/account.env +++ b/environment/account.env @@ -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 diff --git a/nginx/Dockerfile b/nginx/Dockerfile deleted file mode 100644 index 01a0121..0000000 --- a/nginx/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM nginx:mainline-alpine - -RUN rm /etc/nginx/conf.d/default.conf -COPY * /etc/nginx/conf.d/ - -EXPOSE 80 443 diff --git a/nginx/account.conf b/nginx/account.conf deleted file mode 100644 index 035fc15..0000000 --- a/nginx/account.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 80; - server_name account.pretendo.cc; - - location / { - proxy_pass http://account:8080; - proxy_set_header Host $host; - } -} diff --git a/patches/account/entrypoint-fix-exec.patch b/patches/account/entrypoint-fix-exec-and-enable-debugging.patch similarity index 56% rename from patches/account/entrypoint-fix-exec.patch rename to patches/account/entrypoint-fix-exec-and-enable-debugging.patch index 76eb92f..343009a 100644 --- a/patches/account/entrypoint-fix-exec.patch +++ b/patches/account/entrypoint-fix-exec-and-enable-debugging.patch @@ -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 diff --git a/patches/account/entrypoint-no-check-missing-config.patch b/patches/account/entrypoint-no-check-missing-config.patch index 6f3d8e8..2a586f6 100644 --- a/patches/account/entrypoint-no-check-missing-config.patch +++ b/patches/account/entrypoint-no-check-missing-config.patch @@ -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 @@ diff --git a/patches/account/generate-keys-logger-fix.patch b/patches/account/generate-keys-fix-logger-functions.patch similarity index 100% rename from patches/account/generate-keys-logger-fix.patch rename to patches/account/generate-keys-fix-logger-functions.patch diff --git a/patches/account/tsconfig-generate-sourcemap.patch b/patches/account/tsconfig-generate-sourcemap.patch new file mode 100644 index 0000000..43bbdd5 --- /dev/null +++ b/patches/account/tsconfig-generate-sourcemap.patch @@ -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 diff --git a/scripts/setup-submodule-patches.sh b/scripts/setup-submodule-patches.sh index 04d5c92..5e9f504 100755 --- a/scripts/setup-submodule-patches.sh +++ b/scripts/setup-submodule-patches.sh @@ -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