diff --git a/docker-compose.yml b/docker-compose.yml index 7273695f6..f55518b7c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,7 +100,7 @@ services: appstore: container_name: "dootask-appstore-${APP_ID}" privileged: true - image: "kuaifan/dootask-appstore:0.0.3" + image: "dootask/appstore:0.0.1" volumes: - shared_data:/usr/share/dootask - /var/run/docker.sock:/var/run/docker.sock diff --git a/docker/appstore/.gitignore b/docker/appstore/.gitignore index d7233c3f6..035cc0274 100644 --- a/docker/appstore/.gitignore +++ b/docker/appstore/.gitignore @@ -1,5 +1,5 @@ apps/* -configs/* -logs/* +config/* +log/* temp/* !.gitkeep diff --git a/docker/appstore/README.md b/docker/appstore/README.md deleted file mode 100644 index 7ddad6005..000000000 --- a/docker/appstore/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Directory structure - -``` -appstore/ -├── apps/ # Application Directory -├── configs/ # Configuration file directory -└── logs/ # Log file directory -``` diff --git a/docker/appstore/configs/.gitkeep b/docker/appstore/config/.gitkeep similarity index 100% rename from docker/appstore/configs/.gitkeep rename to docker/appstore/config/.gitkeep diff --git a/docker/appstore/logs/.gitkeep b/docker/appstore/log/.gitkeep similarity index 100% rename from docker/appstore/logs/.gitkeep rename to docker/appstore/log/.gitkeep diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 2a556c89a..eb2e51fb7 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -93,7 +93,7 @@ server { proxy_set_header Server-Port $server_port; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; - proxy_pass http://appstore/; + proxy_pass http://appstore:8080/; } include /var/www/docker/appstore/configs/*/nginx.conf; diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 08673b630..a037910a7 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -1204,7 +1204,7 @@ export default { case 'appstore': this.$store.dispatch("openMicroApp", { name: 'appstore', - url: 'appstore/web/', + url: 'appstore/internal', disableScopecss: true, autoDarkTheme: false, }); diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index b0203785d..705826eb4 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -16,7 +16,7 @@