diff --git a/back/.classpath b/back/.classpath index bb1e55b..67e0697 100644 --- a/back/.classpath +++ b/back/.classpath @@ -1,6 +1,6 @@ - + @@ -15,7 +15,6 @@ - @@ -24,5 +23,22 @@ + + + + + + + + + + + + + + + + + diff --git a/back/.project b/back/.project index 80e209d..582cc21 100644 --- a/back/.project +++ b/back/.project @@ -1,10 +1,15 @@ - karauth + karauth_back + + org.eclipse.jdt.core.javabuilder + + + org.eclipse.ui.externaltools.ExternalToolBuilder full,incremental, @@ -25,4 +30,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1647191868592 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/back/Dockerfile b/back/Dockerfile index 00c1cc6..5d62a25 100644 --- a/back/Dockerfile +++ b/back/Dockerfile @@ -17,5 +17,5 @@ WORKDIR /application/ EXPOSE 17080 -CMD ["java", "-cp", "/application/application.jar", "org.kar.oauth.WebLauncher"] +CMD ["java", , "-Xms64M", "-Xmx1G", "-cp", "/application/application.jar", "org.kar.oauth.WebLauncher"] diff --git a/docker-compose.yaml b/docker-compose.yaml index 849f00a..2bf9ba2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,8 +7,12 @@ services: command: --default-authentication-plugin=mysql_native_password env_file: - ./config.env + ports: + - 17036:3306 + # for test only.... volumes: - - ./data:/var/lib/mysql + - /workspace/data/karauth/db:/var/lib/mysql + mem_limit: 400m karauth_adminer_service: image: adminer:latest @@ -17,6 +21,7 @@ services: - 17079:8080 links: - karauth_db_service:db + mem_limit: 100m karauth_back_service: build: back/ @@ -28,5 +33,6 @@ services: - ./config.env links: - karauth_db_service:db + mem_limit: 1200m