diff --git a/.gitmodules b/.gitmodules index 9b15e7df..b1944b02 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,3 +9,7 @@ [submodule "homepage"] path = homepage url = https://gitea.allosaurus-chromatic.ts.net/tlecommunity/homepage.git + +[submodule "super-ui"] + path = super-ui + url = https://gitea.allosaurus-chromatic.ts.net/tlecommunity/super-ui.git diff --git a/app b/app index 9af4ca02..34596b0e 160000 --- a/app +++ b/app @@ -1 +1 @@ -Subproject commit 9af4ca025a9b3cd2c83ca57b63e4ddb563b320cc +Subproject commit 34596b0e66a72557de7e62468b2e9493b93f6695 diff --git a/docker-compose.yml b/docker-compose.yml index b6c58da7..a8b03c81 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,6 @@ volumes: app-node_modules: + super-ui-node_modules: v2-api-node_modules: services: @@ -33,7 +34,7 @@ services: lacuna-memcached: container_name: 'lacuna-memcached' image: 'memcached' - command: + command: # Persist cache in a file to save sessions (and other data) between restarts of the docker container - --memory-file=/tempfs_mount/memory_file volumes: @@ -107,7 +108,7 @@ services: network_mode: service:lacuna-tailscale depends_on: lacuna-server: - condition: service_started + condition: service_started lacuna-tailscale: condition: service_healthy lacuna-v2-api: @@ -125,7 +126,8 @@ services: # - ./app/dist/index.html:/home/lacuna/server/var/www/public/index.html # - ./app/dist/app:/home/lacuna/server/var/www/public/app - ./app/dist:/home/lacuna/server/var/www/public/app - + - ./super-ui/dist:/home/lacuna/server/var/www/public/super-ui + lacuna-v2-api: build: context: . @@ -145,7 +147,7 @@ services: lacuna-app: build: context: . - dockerfile: ./docker/build-app/Dockerfile + dockerfile: ./docker/build-app/Dockerfile container_name: 'lacuna-app' command: npx vite build volumes: @@ -156,6 +158,16 @@ services: - 'LACUNA_SERVER_URL=https://lacuna.allosaurus-chromatic.ts.net' - 'LACUNA_API_KEY=anonymous' + lacuna-super-ui: + build: + context: . + dockerfile: ./docker/build-super-ui/Dockerfile + container_name: lacuna-super-ui + command: npm run build + volumes: + - super-ui-node_modules:/usr/src/app/node_modules + - ./super-ui:/usr/src/app + ############ ## SERVER ## ############ diff --git a/docker/build-super-ui/Dockerfile b/docker/build-super-ui/Dockerfile new file mode 100644 index 00000000..ae9c3b3f --- /dev/null +++ b/docker/build-super-ui/Dockerfile @@ -0,0 +1,6 @@ +FROM node:22 + +WORKDIR /usr/src/app + +COPY ./super-ui/package.json ./super-ui/package-lock.json ./ +RUN npm ci diff --git a/super-ui b/super-ui new file mode 160000 index 00000000..05f20a72 --- /dev/null +++ b/super-ui @@ -0,0 +1 @@ +Subproject commit 05f20a7217db97e91b477fc101283814d830d479