diff --git a/front/Dockerfile b/front/Dockerfile index e0a43c412..19a058cf1 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -14,6 +14,7 @@ COPY nginx.conf sites-available/salix RUN rm sites-enabled/default && ln -s ../sites-available/salix sites-enabled/salix COPY dist /salix/dist +COPY env.template.js /salix/dist COPY nginx-entrypoint.sh / ENTRYPOINT [ "sh", "/nginx-entrypoint.sh" ] diff --git a/front/nginx-entrypoint.sh b/front/nginx-entrypoint.sh index b931ae77a..a6d2b744a 100644 --- a/front/nginx-entrypoint.sh +++ b/front/nginx-entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -WWW_DIR=/usr/share/nginx/html +WWW_DIR=/salix/dist INJECT_FILE_SRC="${WWW_DIR}/env.template.js" INJECT_FILE_DST="${WWW_DIR}/env.js" envsubst < "${INJECT_FILE_SRC}" > "${INJECT_FILE_DST}" diff --git a/package.json b/package.json index ced56412b..f6cec44ab 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,6 @@ "ftps": "^1.2.0", "gm": "^1.25.0", "got": "^10.7.0", - "gulp-rename": "^2.0.0", - "gulp-replace": "^1.1.4", "helmet": "^3.21.2", "i18n": "^0.8.4", "imap": "^0.8.19", @@ -83,6 +81,8 @@ "gulp-print": "^2.0.1", "gulp-wrap": "^0.15.0", "gulp-yaml": "^1.0.1", + "gulp-rename": "^2.0.0", + "gulp-replace": "^1.1.4", "html-loader": "^0.4.5", "html-loader-jest": "^0.2.1", "html-webpack-plugin": "^5.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c0d4924b..b6634196e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,12 +35,6 @@ dependencies: got: specifier: ^10.7.0 version: 10.7.0 - gulp-rename: - specifier: ^2.0.0 - version: 2.0.0 - gulp-replace: - specifier: ^1.1.4 - version: 1.1.4 helmet: specifier: ^3.21.2 version: 3.23.3 @@ -205,6 +199,12 @@ devDependencies: gulp-print: specifier: ^2.0.1 version: 2.0.1 + gulp-rename: + specifier: ^2.0.0 + version: 2.0.0 + gulp-replace: + specifier: ^1.1.4 + version: 1.1.4 gulp-wrap: specifier: ^0.15.0 version: 0.15.0(ejs@2.3.1) @@ -2637,7 +2637,7 @@ packages: /@types/expect@1.20.4: resolution: {integrity: sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==} - dev: false + dev: true /@types/express-serve-static-core@4.17.42: resolution: {integrity: sha512-ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ==} @@ -2802,7 +2802,7 @@ packages: dependencies: '@types/expect': 1.20.4 '@types/node': 20.11.16 - dev: false + dev: true /@types/yargs-parser@21.0.3: resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==} @@ -3787,7 +3787,7 @@ packages: /binaryextensions@2.3.0: resolution: {integrity: sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==} engines: {node: '>=0.8'} - dev: false + dev: true /bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -7112,7 +7112,7 @@ packages: /gulp-rename@2.0.0: resolution: {integrity: sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==} engines: {node: '>=4'} - dev: false + dev: true /gulp-replace@1.1.4: resolution: {integrity: sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==} @@ -7123,7 +7123,7 @@ packages: istextorbinary: 3.3.0 replacestream: 4.0.3 yargs-parser: 21.1.1 - dev: false + dev: true /gulp-util@3.0.8: resolution: {integrity: sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==} @@ -8365,7 +8365,7 @@ packages: dependencies: binaryextensions: 2.3.0 textextensions: 3.3.0 - dev: false + dev: true /jackspeak@2.3.6: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} @@ -10829,6 +10829,7 @@ packages: /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} + dev: true /object-copy@0.1.0: resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==} @@ -12109,7 +12110,7 @@ packages: escape-string-regexp: 1.0.5 object-assign: 4.1.1 readable-stream: 2.3.8 - dev: false + dev: true /request@2.88.2: resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==} @@ -13612,7 +13613,7 @@ packages: /textextensions@3.3.0: resolution: {integrity: sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==} engines: {node: '>=8'} - dev: false + dev: true /throat@5.0.0: resolution: {integrity: sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==}