Skip to content

Commit 6b0d811

Browse files
committed
try without flyway
1 parent 24627e1 commit 6b0d811

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

.nais/test/klass-api-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
memory: 1400Mi
2323
env:
2424
- name: SPRING_PROFILES_ACTIVE
25-
value: api,postgres-open-search, skip-indexing, remote-open-search
25+
value: api, postgres-open-search, solr-remote, skip-indexing
2626
- name: SPRING_DATA_SOLR_HOST
2727
value: http://klass-solr/solr
2828
- name: KLASS_ENV_CLIENT_KLASS_MAIL_URL

klass-api/src/main/resources/application-postgres-open-search.properties

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ spring.datasource.hikari.data-source-properties.connectTimeout = 30
1010
spring.datasource.hikari.data-source-properties.socketTimeout = 60
1111
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
1212

13-
spring.datasource.tomcat.max-active=5
14-
spring.datasource.tomcat.max-idle=5
15-
spring.datasource.tomcat.remove-abandoned=true
16-
spring.jpa.properties.hibernate.format_sql=true
17-
18-
# Flyway
19-
spring.flyway.enabled=true
20-
spring.flyway.url=${NAIS_DATABASE_KLASS_KLASS_JDBC_URL}
21-
spring.flyway.password=${NAIS_DATABASE_KLASS_KLASS_PASSWORD}
22-
spring.flyway.user=${NAIS_DATABASE_KLASS_KLASS_USERNAME}
23-
spring.flyway.locations=classpath:db/migration
24-
# This is for first time running on a database with data, but no flyway schema history table
25-
spring.flyway.baseline-on-migrate=true
13+
spring.flyway.enabled=false
14+
#spring.datasource.tomcat.max-active=5
15+
#spring.datasource.tomcat.max-idle=5
16+
#spring.datasource.tomcat.remove-abandoned=true
17+
#spring.jpa.properties.hibernate.format_sql=true
18+
#
19+
## Flyway
20+
#spring.flyway.enabled=true
21+
#spring.flyway.url=${NAIS_DATABASE_KLASS_KLASS_JDBC_URL}
22+
#spring.flyway.password=${NAIS_DATABASE_KLASS_KLASS_PASSWORD}
23+
#spring.flyway.user=${NAIS_DATABASE_KLASS_KLASS_USERNAME}
24+
#spring.flyway.locations=classpath:db/migration
25+
## This is for first time running on a database with data, but no flyway schema history table
26+
#spring.flyway.baseline-on-migrate=true

0 commit comments

Comments
 (0)