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

Upgrade openspecimen to v10.1.RC1 #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 3 additions & 4 deletions appinfo.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"name": "OpenSpecimen",
"short_name": "OpenSpecimen",
"version": "v9.0.RC2",
"description": "OpenSpecimen Version 9.0.RC2",
"version": "v10.1.RC1",
"description": "OpenSpecimen Version 10.1.RC1",
"catalogue_url": "http://biobankapps.com/software/view?id=26",
"application_url": "https://www.openspecimen.org/",
"tags": ["Sample Management", "BIMS"],
"application_documentation_url": "https://openspecimen.atlassian.net/wiki/spaces/CAT",

"instance_information": "<p> OpenSpecimen is a highly Configurable Biospecimen Management System, which enables to track the Complete Lifecycle of your Biospecimen Inventory from Collection to Utilization. <br>user: admin </br> <br> password: Login@123>br/></p>"
"instance_information": "<p> OpenSpecimen is a highly Configurable Biospecimen Management System, which enables to track the Complete Lifecycle of your Biospecimen Inventory from Collection to Utilization. <p>To login use: </p><p>user:admin </p><p>password:Login@123 </p>"

}
Binary file removed configs/openspecimen/scripts/adduser.jar
Binary file not shown.
15 changes: 0 additions & 15 deletions configs/openspecimen/scripts/defaultvar.sh

This file was deleted.

17 changes: 0 additions & 17 deletions configs/openspecimen/scripts/entrypoint.sh

This file was deleted.

182 changes: 0 additions & 182 deletions configs/openspecimen/scripts/waitforit.sh

This file was deleted.

8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- SYS_NICE

local-openspecimen-web:
image: bibbox/openspecimen:9-0-RC2
image: bibbox/openspecimen:v10.1.RC1
container_name: local-openspecimen-web
user: tomcat
restart: unless-stopped
Expand All @@ -34,16 +34,16 @@ services:
- local-openspecimen-db:openspecimen-db
environment:
- DATABASE_HOST=openspecimen-db
- DATABASE_PORT=3306
- MYSQL_ROOT_PASSWORD=openspecimen
- MYSQL_DATABASE=openspecimen
- MYSQL_USER=openspecimen
- MYSQL_PASSWORD=openspecimen
depends_on:
- local-openspecimen-db
volumes:
- ./data/os-data:/var/lib/tomcat9/openspecimen/data
- ./data/os-plugins:/var/lib/tomcat9/openspecimen/plugins
- ./data/os-data:/var/lib/openspecimen/data
- ./data/os-plugins:/var/lib/openspecimen/plugins
- ./configs/openspecimen/ROOT:/var/lib/tomcat9/webapps/ROOT
- ./configs/openspecimen/scripts/entrypoint.sh:/opt/scripts/entrypoint.sh
ports:
- "9000:8080"
8 changes: 4 additions & 4 deletions docker-compose.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- ./configs/openspecimen.cnf:/etc/mysql/conf.d/openspecimen.cnf:ro

§§INSTANCE-openspecimen-web:
image: bibbox/openspecimen:9-0-RC2
image: bibbox/openspecimen:v10.1.RC1
container_name: §§INSTANCE-openspecimen-web
restart: unless-stopped
user: tomcat
Expand All @@ -32,6 +32,7 @@ services:
- §§INSTANCE-openspecimen-db:openspecimen-db
environment:
- DATABASE_HOST=openspecimen-db
- DATABASE_PORT=3306
- MYSQL_ROOT_PASSWORD=thispasswordisneverusededoutsidethecontainer
- MYSQL_DATABASE=openspecimen
- MYSQL_USER=§§MYSQL_DATABASE_USER
Expand All @@ -44,9 +45,8 @@ services:
depends_on:
- §§INSTANCE-openspecimen-db
volumes:
- ./data/os-data:/var/lib/tomcat9/openspecimen/data
- ./data/os-plugins:/var/lib/tomcat9/openspecimen/plugins
- ./data/os-data:/var/lib/openspecimen/data
- ./data/os-plugins:/var/lib/openspecimen/plugins
- ./configs/openspecimen/ROOT:/var/lib/tomcat9/webapps/ROOT
- ./configs/openspecimen/scripts/entrypoint.sh:/opt/scripts/entrypoint.sh
ports:
- "9000:8080"