diff --git a/.chug/docker/compose/editor-development.yml b/.chug/docker/compose/editor-development.yml index f4badd8..4c1d9ca 100644 --- a/.chug/docker/compose/editor-development.yml +++ b/.chug/docker/compose/editor-development.yml @@ -1,46 +1,45 @@ -version: '3' +version: "3" services: gate: image: traefik:v2.4.7 - command: - - --api.insecure=true - - --providers.docker=true - - --entrypoints.web.address=:80 + command: + - --api.insecure=true + - --providers.docker=true + - --entrypoints.web.address=:80 ports: - - 8080:80 - - 9090:8080 + - 8080:80 + - 9090:8080 volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro + - /var/run/docker.sock:/var/run/docker.sock:ro back: user: ${CURRENT_UID} - build: + build: dockerfile: quarkus-dev context: ../img labels: - traefik.enable: 'true' + traefik.enable: "true" traefik.http.routers.back.entrypoints: web traefik.http.routers.back.rule: PathPrefix(`/api`) - traefik.http.services.back.loadbalancer.server.port: '8080' - traefik.http.routers.back.middlewares: "back_strip" - traefik.http.middlewares.back_strip.stripprefix.prefixes: "/api" + traefik.http.services.back.loadbalancer.server.port: "8080" volumes: - ../../../traqtor-editor/back:/app:cached - ../../.cache/mvn:/mvn:delegated + - ~/:/home/dude expose: - 8080 face: user: ${CURRENT_UID} - build: + build: dockerfile: quasar-dev context: ../img labels: - traefik.enable: 'true' + traefik.enable: "true" traefik.http.routers.face.entrypoints: web traefik.http.routers.face.rule: PathPrefix(`/`) - traefik.http.services.face.loadbalancer.server.port: '8080' + traefik.http.services.face.loadbalancer.server.port: "8080" volumes: - ../../../traqtor-editor/face:/app:cached - ../../.cache/npm:/app/node_modules:delegated expose: - - 8080 \ No newline at end of file + - 8080 diff --git a/.chug/docker/img/quarkus-dev b/.chug/docker/img/quarkus-dev index 6fdb2c1..72343a2 100644 --- a/.chug/docker/img/quarkus-dev +++ b/.chug/docker/img/quarkus-dev @@ -1,6 +1,6 @@ -FROM amazoncorretto:16-alpine-jdk -RUN adduser dude --disabled-password --home /app --uid 412 && \ - echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/java-16-amazon-corretto/conf/security/java.security && \ +FROM amazoncorretto:11-alpine-jdk +RUN adduser dude --disabled-password --home /home/dude --uid 412 && \ + echo "securerandom.source=file:/dev/urandom" >> /usr/lib/jvm/default-jvm/conf/security/java.security && \ wget https://apache-mirror.rbc.ru/pub/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz && \ tar -zxvf apache-maven-3.6.3-bin.tar.gz -C /opt/ && \ rm apache-maven-3.6.3-bin.tar.gz && \ @@ -9,6 +9,7 @@ RUN adduser dude --disabled-password --home /app --uid 412 && \ ln -s /opt/maven/bin/mvn /usr/bin/mvn && \ mkdir /mvn && \ chmod 777 /mvn && \ + mkdir /app && \ chmod 777 /app USER dude EXPOSE 8080 diff --git a/traqtor-editor/back/pom.xml b/traqtor-editor/back/pom.xml index ff5f1a2..a0cd208 100644 --- a/traqtor-editor/back/pom.xml +++ b/traqtor-editor/back/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 two.pm.traqtor editor @@ -38,6 +37,10 @@ io.quarkus quarkus-resteasy + + io.quarkus + quarkus-resteasy-jackson + io.quarkus quarkus-junit5 diff --git a/traqtor-editor/back/src/main/resources/application.properties b/traqtor-editor/back/src/main/resources/application.properties index e69de29..308570d 100644 --- a/traqtor-editor/back/src/main/resources/application.properties +++ b/traqtor-editor/back/src/main/resources/application.properties @@ -0,0 +1,3 @@ +# quarkus.http.root-path=/api #Code-lens fails to produce correct link. If they'll fix it, we'll use it. + +file-manager.home = /home/dude \ No newline at end of file diff --git a/traqtor.code-workspace b/traqtor.code-workspace index 76cf005..c03ade5 100644 --- a/traqtor.code-workspace +++ b/traqtor.code-workspace @@ -1,5 +1,9 @@ { "folders": [ + { + "name": "_root", + "path": "." + }, { "name": "chug", "path": ".chug" @@ -14,6 +18,11 @@ } ], "settings": { + "workbench.editor.labelFormat": "medium", + "files.exclude": { + "*/**/node_modules/": true, + "*/**/.quasar/": true + }, "java.configuration.updateBuildConfiguration": "automatic", "editor.formatOnSave": true, "editor.rulers": [120],