Skip to content

Commit 19db64c

Browse files
committed
Merge branch 'release/1.17.0'
2 parents 7238f7f + a328a6a commit 19db64c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

templates/init_migration.sh.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ java -Ddw.database.user=postgres -Ddw.database.password="{{{ POSTGRES_DBPASSWORD
1212
# this particular migration needs to run as postgres because only postgres can surrender ownership
1313
java -Ddw.database.user=postgres -Ddw.database.password="{{{ POSTGRES_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.7.0.relinquish
1414
# future migrations will start here and should be run as dockstore
15-
java -Ddw.database.user=dockstore -Ddw.database.password="{{{ DOCKSTORE_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.8.0,1.9.0,1.10.0,1.11.0,1.12.0,1.13.0,1.14.0,1.15.0,1.16.0
15+
java -Ddw.database.user=dockstore -Ddw.database.password="{{{ DOCKSTORE_DBPASSWORD }}}" -jar /home/dockstore-webservice-*.jar db migrate web.yml --include 1.8.0,1.9.0,1.10.0,1.11.0,1.12.0,1.13.0,1.14.0,1.15.0,1.16.0,1.17.0

templates/web.yml.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,9 @@ database:
150150

151151
server:
152152
applicationConnectors:
153-
- type: custom-http
153+
- type: http
154154
port: 8080
155+
uriCompliance: LEGACY
155156
adminConnectors:
156157
- type: http
157158
port: 8001

0 commit comments

Comments
 (0)