Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump acorn from 6.4.0 to 6.4.1 in /front #35

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:[email protected]/heroku_7013a700c5d03a4?reconnect=true
SPRING_DATASOURCE_USERNAME: b8e819c239af2b
SPRING_DATASOURCE_PASSWORD: ce5382cc

volumes:
- /var/run/docker.sock:/var/run/docker.sock
Expand Down
2 changes: 1 addition & 1 deletion front/default.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server {
listen 4200;
listen $PORT;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
Expand Down
2 changes: 1 addition & 1 deletion front/e2e/protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions front/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 15 additions & 3 deletions server/src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -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:[email protected]/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
Expand Down