diff --git a/docker-compose.yml b/docker-compose.yml index 0a8ab5b8..4e4dce67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: # - GID=1000 restart: unless-stopped healthcheck: - test: ['CMD', 'node', '/app/bin/healthcheck'] + test: ['CMD', 'node', '/app/services/healthcheck'] interval: 1m30s timeout: 10s retries: 3 diff --git a/package.json b/package.json index e70245f1..83706219 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,11 @@ "dev": "vue-cli-service serve", "build": "vue-cli-service build", "lint": "vue-cli-service lint --fix", + "pm2-start": "npx pm2 start server.js", "build-watch": "vue-cli-service build --watch", "build-and-start": "npm-run-all --parallel build start", "validate-config": "node src/utils/ConfigValidator", - "health-check": "node bin/healthcheck" + "health-check": "node services/healthcheck" }, "dependencies": { "ajv": "^8.5.0", diff --git a/bin/healthcheck.js b/services/healthcheck.js similarity index 100% rename from bin/healthcheck.js rename to services/healthcheck.js diff --git a/vue.config.js b/vue.config.js index 9883bae5..30be157a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,5 @@ module.exports = { + publicPath: process.env.BASE_URL, // || './', chainWebpack: config => { config.module.rules.delete('svg'); }, diff --git a/yarn.lock b/yarn.lock index c771d857..e067356e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2411,9 +2411,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001236" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001236.tgz#0a80de4cdf62e1770bb46a30d884fc8d633e3958" - integrity sha512-o0PRQSrSCGJKCPZcgMzl5fUaj5xHe8qA2m4QRvnyY4e1lITqoNkr7q/Oh1NcpGSy0Th97UZ35yoKcINPoq7YOQ== + version "1.0.30001237" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5" + integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw== case-sensitive-paths-webpack-plugin@^2.3.0: version "2.4.0" @@ -3715,9 +3715,9 @@ eslint-plugin-standard@^4.0.0: integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ== eslint-plugin-vue@^7.9.0: - version "7.11.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz#c19b098899b7e3cd692beffbbe73611064ef1ea6" - integrity sha512-Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw== + version "7.11.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz#77eb4b44032d5cca79f9af21d06991d8694a314a" + integrity sha512-lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" @@ -7378,9 +7378,9 @@ regexpp@^2.0.1: integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^4.7.1: version "4.7.1"