From 6b6e09874760dddf2a38d8790a0c4e239e426069 Mon Sep 17 00:00:00 2001 From: AdamJochna Date: Fri, 31 Jan 2020 18:06:26 +0100 Subject: [PATCH 1/3] ok --- docker-compose.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b131211..ae0673c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,10 +12,13 @@ services: depends_on: - db # This service depends on mysql. Start that first. environment: # Pass environment variables to the service - SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/db3s + #SPRING_DATASOURCE_URL: jdbc:mysql://db:3306/db3s #?useSSL=false&serverTimezone=UTC&useLegacyDatetimeCode=false - SPRING_DATASOURCE_USERNAME: root - SPRING_DATASOURCE_PASSWORD: 1q2w3e4r + #SPRING_DATASOURCE_USERNAME: root + #SPRING_DATASOURCE_PASSWORD: 1q2w3e4r + SPRING_DATASOURCE_URL: jdbc:mysql://b8e819c239af2b:ce5382cc@eu-cdbr-west-02.cleardb.net/heroku_7013a700c5d03a4?reconnect=true + SPRING_DATASOURCE_USERNAME: b8e819c239af2b + SPRING_DATASOURCE_PASSWORD: ce5382cc volumes: - /var/run/docker.sock:/var/run/docker.sock From 4396b0745ed80fa222677b55974a487fc7e0f49c Mon Sep 17 00:00:00 2001 From: AdamJochna Date: Fri, 31 Jan 2020 18:09:46 +0100 Subject: [PATCH 2/3] ok --- front/default.conf | 2 +- front/e2e/protractor.conf.js | 2 +- front/package.json | 2 +- .../src/main/resources/application.properties | 18 +++++++++++++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/front/default.conf b/front/default.conf index ef78325..654fa98 100644 --- a/front/default.conf +++ b/front/default.conf @@ -1,5 +1,5 @@ server { - listen 4200; + listen $PORT; location / { root /usr/share/nginx/html; index index.html index.htm; diff --git a/front/e2e/protractor.conf.js b/front/e2e/protractor.conf.js index 7c798cf..9955817 100644 --- a/front/e2e/protractor.conf.js +++ b/front/e2e/protractor.conf.js @@ -16,7 +16,7 @@ exports.config = { browserName: 'chrome' }, directConnect: true, - baseUrl: 'http://localhost:4200/', + baseUrl: 'https://nokia3s-front.herokuapp.com/', framework: 'jasmine', jasmineNodeOpts: { showColors: true, diff --git a/front/package.json b/front/package.json index 7017fa7..94345dd 100644 --- a/front/package.json +++ b/front/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --port $PORT --host 0.0.0.0 --disable-host-check", "build": "ng build", "test": "ng test", "lint": "ng lint", diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index daace06..acf630d 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1,12 +1,24 @@ ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties) -spring.datasource.url = jdbc:mysql://localhost:3306/db3s + + +#spring.datasource.url = jdbc:mysql://localhost:3306/db3s #?useSSL=false -spring.datasource.username = root -spring.datasource.password = 1q2w3e4r +#spring.datasource.username = root +#spring.datasource.password = 1q2w3e4r + +spring.datasource.url = jdbc:mysql://b8e819c239af2b:ce5382cc@eu-cdbr-west-02.cleardb.net/heroku_7013a700c5d03a4?reconnect=true +spring.datasource.username = b8e819c239af2b +spring.datasource.password = ce5382cc + +spring.datasource.hikari.connectionTimeout=30000 +spring.datasource.hikari.idleTimeout=600000 +spring.datasource.hikari.maxLifetime=27000000 + spring.session.jdbc.initialize-schema: always + ## Hibernate Properties # The SQL dialect makes Hibernate generate better SQL for the chosen database spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect From cd12b7bb45814dcaee625f24cfcbb69aabfc0097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Apr 2020 11:56:58 +0000 Subject: [PATCH 3/3] Bump acorn from 6.4.0 to 6.4.1 in /front Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] --- front/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/package-lock.json b/front/package-lock.json index 94199e0..24350e3 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -2300,9 +2300,9 @@ } }, "acorn": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true }, "adm-zip": {