Skip to content

Commit

Permalink
feat(playground): add collaboration (#1717)
Browse files Browse the repository at this point in the history
* feat(playground): add colloab playground

* fix(sql-playground): resolve bugs in playground tabs

* fix(playground): remove bugs in result and input tabs

* fix(sql-playground): fix input tabs and active database selection

* feat(sql-playground): finalize collab

* chore(playground): fix kotlin lint errors

* fix(sql-parser): fix dockerfile

* feat(eat): fix dockerfile
  • Loading branch information
Zitrone44 authored Jan 15, 2025
1 parent 4180602 commit ce2b40a
Show file tree
Hide file tree
Showing 95 changed files with 4,802 additions and 1,381 deletions.
25 changes: 18 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ services:
networks:
classroom:
fbs:
healthcheck:
test: curl -k https://localhost:443/actuator/health
timeout: 10s
interval: 10s
start_period: 10s
retries: 3
#healthcheck:
# test: curl -k https://localhost:443/actuator/health
# timeout: 10s
# interval: 10s
# start_period: 10s
# retries: 3

mysql-checker:
image: mysql:8.0
Expand Down Expand Up @@ -201,7 +201,8 @@ services:
BASH_DOCKER: thmmniii/fbs-runtime-bash:dev-latest
HOST_TMP_DIR: /tmp/feebi # Need to be the same folder as mounted to /dockertemp
INSIDE_DOCKER: "true"
RESULT_SERVER_HOST: core
RESULT_SERVER_HOST: 172.17.0.1
RESULT_SERVER_PORT: 8443
MYSQL_SERVER_URL: jdbc:mysql://mysql-checker:3306?allowMultiQueries=true
MYSQL_SERVER_PASSWORD: SqfyBWhiFGr7FK60cVR2rel
PSQL_SERVER_URL: jdbc:postgresql://psql-checker:5432/?allowMultiQueries=true
Expand Down Expand Up @@ -263,6 +264,16 @@ services:
- FBS_BASE_URL=https://core:443
- FBS_TLS_NO_VERIFY=true

collab:
build:
context: modules/fbs-collab
restart: always
ports:
- 1234:1234
environment:
- FBS_ROOT_URL=https://core
- NODE_TLS_REJECT_UNAUTHORIZED=0

networks:
classroom:
fbs:
8 changes: 8 additions & 0 deletions modules/fbs-collab/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM node:22-alpine
USER node
COPY --chown=node package.json package-lock.json tsconfig.json /app/
WORKDIR /app
RUN npm ci
COPY --chown=node src/ src/
RUN npm run build
CMD ["node", "src/app.js"]
Loading

0 comments on commit ce2b40a

Please sign in to comment.