diff --git a/bin/ops/export-all-k8s.sh b/bin/ops/export-all-k8s.sh
index e01730330..78676dc5a 100755
--- a/bin/ops/export-all-k8s.sh
+++ b/bin/ops/export-all-k8s.sh
@@ -57,7 +57,13 @@ kubectl -n $NS wait --for=condition=Ready pod/${POD}
for d in ${DATABASES}; do
DUMP_FILE="${DIR}/${d}.sql"
- APP_POD=$(kubectl -n $NS get pod -l tier=${d}-api-php -o jsonpath="{.items[0].metadata.name}") || continue
+
+ dpod="$d"
+ if [ "$dpod" = "upload" ]; then
+ dpod="uploader"
+ fi
+
+ APP_POD=$(kubectl -n $NS get pod -l tier=${dpod}-api-php -o jsonpath="{.items[0].metadata.name}") || continue
DB_NAME=$(kubectl -n $NS exec ${APP_POD} -- /bin/ash -c 'echo $DB_NAME')
if [ -z "${DB_NAME}" ]; then
DB_NAME="${d}"
diff --git a/bin/ops/import-all-k8s.sh b/bin/ops/import-all-k8s.sh
index 3a45df26e..c08ad105e 100755
--- a/bin/ops/import-all-k8s.sh
+++ b/bin/ops/import-all-k8s.sh
@@ -106,7 +106,12 @@ for d in ${DATABASES}; do
continue
fi
- APP_POD=$(kubectl -n $NS get pod -l tier=${d}-api-php -o jsonpath="{.items[0].metadata.name}")
+ dpod="$d"
+ if [ "$dpod" = "upload" ]; then
+ dpod="uploader"
+ fi
+
+ APP_POD=$(kubectl -n $NS get pod -l tier=${dpod}-api-php -o jsonpath="{.items[0].metadata.name}")
DB_NAME=$(kubectl -n $NS exec ${APP_POD} -- /bin/ash -c 'echo $DB_NAME')
CONN_ARGS="-U ${DB_USER} --host ${DB_HOST} --port ${DB_PORT} ${DB_NAME}"
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 2939dcc79..386b8f153 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -26,6 +26,7 @@ services:
target: client-build
volumes:
- ./expose/client:/srv/workspace/expose/client:rw
+ - ./lib/js:/lib/js
environment:
- WDS_SOCKET_PORT=443
@@ -47,6 +48,7 @@ services:
- PHP_IDE_CONFIG=serverName=${PS_DEBUG_SERVER_NAME_PREFIX}expose
volumes:
- ./expose/api:/srv/app
+ - ./lib/php:/lib/php
expose-api-nginx:
volumes:
@@ -57,6 +59,7 @@ services:
expose-worker:
volumes:
- ./expose/api:/srv/app
+ - ./lib/php:/lib/php
- ./expose/api/docker/supervisor:/etc/supervisor.d
uploader-api-php:
@@ -67,10 +70,12 @@ services:
- PHP_IDE_CONFIG=serverName=${PS_DEBUG_SERVER_NAME_PREFIX}uploader
volumes:
- ./uploader/api:/srv/app
+ - ./lib/php:/lib/php
uploader-worker:
volumes:
- ./uploader/api:/srv/app
+ - ./lib/php:/lib/php
- ./uploader/api/docker/supervisor:/etc/supervisor.d
uploader-api-nginx:
@@ -85,6 +90,7 @@ services:
- PHP_IDE_CONFIG=serverName=${PS_DEBUG_SERVER_NAME_PREFIX}notify
volumes:
- ./notify/api:/srv/app
+ - ./lib/php:/lib/php
notify-api-nginx:
volumes:
@@ -93,6 +99,7 @@ services:
notify-worker:
volumes:
- ./notify/api:/srv/app
+ - ./lib/php:/lib/php
- ./notify/api/docker/supervisor:/etc/supervisor.d
databox-api-php:
@@ -113,6 +120,7 @@ services:
databox-worker:
volumes:
- ./databox/api:/srv/app
+ - ./lib/php:/lib/php
- ./databox/api/docker/supervisor:/etc/supervisor.d
elasticsearch:
diff --git a/expose/client/index.tpl.html b/expose/client/index.tpl.html
index 85d140134..53ffa2ccf 100644
--- a/expose/client/index.tpl.html
+++ b/expose/client/index.tpl.html
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
+ To begin the development, run `npm start` or `yarn start`.
+ To create a production bundle, use `npm run build` or `yarn build`.
+-->
+
diff --git a/expose/client/src/component/PublicationNavigation.jsx b/expose/client/src/component/PublicationNavigation.jsx
index 2c346ef66..38d79530b 100644
--- a/expose/client/src/component/PublicationNavigation.jsx
+++ b/expose/client/src/component/PublicationNavigation.jsx
@@ -66,14 +66,14 @@ class PublicationNavigation extends PureComponent {
}
class NavTree extends PureComponent {
- static propTypes = {
- publications: PropTypes.array.isRequired,
- current: PropTypes.object.isRequired,
- depth: PropTypes.number.isRequired,
- openChildren: PropTypes.bool,
- onSelect: PropTypes.func.isRequired,
- loading: PropTypes.string,
- }
+ // static propTypes = {
+ // publications: PropTypes.array.isRequired,
+ // current: PropTypes.object.isRequired,
+ // depth: PropTypes.number.isRequired,
+ // openChildren: PropTypes.bool,
+ // onSelect: PropTypes.func.isRequired,
+ // loading: PropTypes.string,
+ // }
state = {
publicationChildren: {},
diff --git a/expose/client/vite.config.ts b/expose/client/vite.config.ts
index d1f9307f4..b3aafde29 100644
--- a/expose/client/vite.config.ts
+++ b/expose/client/vite.config.ts
@@ -10,4 +10,8 @@ export default defineConfig({
include: "**/*.svg?react",
})
],
+ server: {
+ port: 3000,
+ host: '0.0.0.0'
+ }
})