From b6cfe17e79e1576fcee9b1d19233dbfa2a1d9634 Mon Sep 17 00:00:00 2001 From: Wassilios Lytras Date: Wed, 4 Dec 2024 21:03:19 +0100 Subject: [PATCH] Bugfix/revert vue version - fix docker-compose (#405) * Revert "Bump vue from 2.7.16 to 3.0.0 in /WebUI (#398)" This reverts commit dbbe0a5b89ab87075c46207e1b943860be9a7e39. * Update docker-compose.yml Fixes issue with environment variable not populated properly into config and enables UI by default. --- WebUI/package.json | 2 +- WebUI/yarn.lock | 94 +--------------------------------------------- docker-compose.yml | 11 +++--- 3 files changed, 8 insertions(+), 99 deletions(-) diff --git a/WebUI/package.json b/WebUI/package.json index 9d25abfa..c162240e 100644 --- a/WebUI/package.json +++ b/WebUI/package.json @@ -21,7 +21,7 @@ "moment-timezone": "^0.5.35", "sweetalert2": "^11.4.14", "vee-validate": "^2.2.0", - "vue": "^3.0.0", + "vue": "^2.6.14", "vue-chartjs": "^4.1.0", "vue-highcharts": "^0.1.0", "vue-router": "^3.1.3", diff --git a/WebUI/yarn.lock b/WebUI/yarn.lock index 03bb973f..0edbdf41 100644 --- a/WebUI/yarn.lock +++ b/WebUI/yarn.lock @@ -206,21 +206,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== -"@babel/helper-string-parser@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" - integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== - "@babel/helper-validator-identifier@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== -"@babel/helper-validator-identifier@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" - integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== - "@babel/helper-validator-option@^7.24.8": version "7.24.8" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" @@ -253,13 +243,6 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.11.5": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.9.tgz#8fcaa079ac7458facfddc5cd705cc8005e4d3817" - integrity sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg== - dependencies: - "@babel/types" "^7.25.9" - "@babel/parser@^7.23.5", "@babel/parser@^7.25.0", "@babel/parser@^7.25.4", "@babel/parser@^7.7.0": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a" @@ -702,14 +685,6 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.11.5", "@babel/types@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.9.tgz#620f35ea1f4233df529ec9a2668d2db26574deee" - integrity sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ== - dependencies: - "@babel/helper-string-parser" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4", "@babel/types@^7.7.0": version "7.25.4" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f" @@ -1081,25 +1056,6 @@ semver "^6.0.0" string.prototype.padstart "^3.0.0" -"@vue/compiler-core@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0.tgz#25e4f079cf6c39f83bad23700f814c619105a0f2" - integrity sha512-XqPC7vdv4rFE77S71oCHmT1K4Ks3WE2Gi6Lr4B5wn0Idmp+NyQQBUHsCNieMDRiEpgtJrw+yOHslrsV0AfAsfQ== - dependencies: - "@babel/parser" "^7.11.5" - "@babel/types" "^7.11.5" - "@vue/shared" "3.0.0" - estree-walker "^2.0.1" - source-map "^0.6.1" - -"@vue/compiler-dom@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0.tgz#4cbb48fcf1f852daef2babcf9953b681ac463526" - integrity sha512-ukDEGOP8P7lCPyStuM3F2iD5w2QPgUu2xwCW2XNeqPjFKIlR2xMsWjy4raI/cLjN6W16GtlMFaZdK8tLj5PRog== - dependencies: - "@vue/compiler-core" "3.0.0" - "@vue/shared" "3.0.0" - "@vue/compiler-sfc@2.7.16": version "2.7.16" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz#ff81711a0fac9c68683d8bb00b63f857de77dc83" @@ -1132,35 +1088,6 @@ resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab" integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ== -"@vue/reactivity@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0.tgz#fd15632a608650ce2a969c721787e27e2c80aa6b" - integrity sha512-mEGkztGQrAPZRhV7C6PorrpT3+NtuA4dY2QjMzzrW31noKhssWTajRZTwpLF39NBRrF5UU6cp9+1I0FfavMgEQ== - dependencies: - "@vue/shared" "3.0.0" - -"@vue/runtime-core@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0.tgz#480febf1bfe32798b6abbd71a88f8e8b473a51c2" - integrity sha512-3ABMLeA0ZbeVNLbGGLXr+pNUwqXILOqz8WCVGfDWwQb+jW114Cm8djOHVVDoqdvRETQvDf8yHSUmpKHZpQuTkA== - dependencies: - "@vue/reactivity" "3.0.0" - "@vue/shared" "3.0.0" - -"@vue/runtime-dom@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0.tgz#e0d1f7c7e22e1318696014cc3501e06b288c2e11" - integrity sha512-f312n5w9gK6mVvkDSj6/Xnot1XjlKXzFBYybmoy6ahAVC8ExbQ+LOWti1IZM/adU8VMNdKaw7Q53Hxz3y5jX8g== - dependencies: - "@vue/runtime-core" "3.0.0" - "@vue/shared" "3.0.0" - csstype "^2.6.8" - -"@vue/shared@3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0.tgz#ec089236629ecc0f10346b92f101ff4339169f1a" - integrity sha512-4XWL/avABGxU2E2ZF1eZq3Tj7fvksCMssDZUHOykBIMmh5d+KcAnQMC5XHMhtnA0NAvktYsA2YpdsVwVmhWzvA== - "@vue/web-component-wrapper@^1.2.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a" @@ -2958,11 +2885,6 @@ csso@^4.0.2: dependencies: css-tree "^1.1.2" -csstype@^2.6.8: - version "2.6.21" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== - csstype@^3.1.0: version "3.1.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" @@ -3757,11 +3679,6 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== -estree-walker@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== - esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -9049,7 +8966,7 @@ vue2-daterange-picker@^0.6.8: dependencies: vue "^2.6.10" -vue@^2.6.10: +vue@^2.6.10, vue@^2.6.14: version "2.7.16" resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9" integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw== @@ -9057,15 +8974,6 @@ vue@^2.6.10: "@vue/compiler-sfc" "2.7.16" csstype "^3.1.0" -vue@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0.tgz#cfb5df5c34efce319b113a1667d12b74dcfd9c90" - integrity sha512-ZMrAARZ32sGIaYKr7Fk2GZEBh/VhulSrGxcGBiAvbN4fhjl3tuJyNFbbbLFqGjndbLoBW66I2ECq8ICdvkKdJw== - dependencies: - "@vue/compiler-dom" "3.0.0" - "@vue/runtime-dom" "3.0.0" - "@vue/shared" "3.0.0" - vuelidate@^0.7.7: version "0.7.7" resolved "https://registry.yarnpkg.com/vuelidate/-/vuelidate-0.7.7.tgz#5df3930a63ddecf56fde7bdacea9dbaf0c9bf899" diff --git a/docker-compose.yml b/docker-compose.yml index 9c21ec92..c3db1fa7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,14 +9,15 @@ services: - 4081:10081 - ${HOST_RESTAPI_PORT:-8443}:8080 environment: - - OPENAS2PROP_RESTAPI__COMMAND__PROCESOR__BASEURI="http://0.0.0.0:8080" - - OPENAS2PROP_RESTAPI__COMMAND__PROCESOR__USERID="userID" - - OPENAS2PROP_RESTAPI__COMMAND__PROCESOR__PASSWORD="pWd" + - OPENAS2PROP_RESTAPI__COMMAND__PROCESSOR__BASEURI=http://0.0.0.0:8080 + - OPENAS2PROP_RESTAPI__COMMAND__PROCESSOR__USERID=userID + - OPENAS2PROP_RESTAPI__COMMAND__PROCESSOR__PASSWORD=pWd + - OPENAS2PROP_RESTAPI__COMMAND__PROCESSOR__ENABLED=true tty: true stdin_open: true volumes: - - config:/opt/openas2/config:rw - - data:/opt/openas2/data:rw + - ./config:/opt/openas2/config:rw + - ./data:/opt/openas2/data:rw openas2_webui: