Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
Icat Compose
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ICAT
Icat Compose
Commits
90c48806
Commit
90c48806
authored
6 months ago
by
Tanuja Selvaraj
Browse files
Options
Downloads
Patches
Plain Diff
Added mongo
parent
2a66b68c
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.env
+1
-1
1 addition, 1 deletion
.env
docker-compose.yml
+14
-1
14 additions, 1 deletion
docker-compose.yml
icat-plus/.env.test.compose
+3
-3
3 additions, 3 deletions
icat-plus/.env.test.compose
icat-plus/Dockerfile
+1
-1
1 addition, 1 deletion
icat-plus/Dockerfile
with
19 additions
and
6 deletions
.env
+
1
−
1
View file @
90c48806
...
...
@@ -25,7 +25,7 @@ EDATAPORTAL_PORT=3000
# ICAT+
CI_COMMIT_SHA= master # this could be commit sha or branch name
NPM_COMMAND=
start #
test -- --grep /logbook/
NPM_COMMAND=test -- --grep /logbook/
ICAT_PLUS_PORT=8000
# AUTH.DB
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
14
−
1
View file @
90c48806
...
...
@@ -61,7 +61,7 @@ services:
environment
:
WAIT_HOSTS
:
icat:8080, mariadb:3306, auth-db:8080
WAIT_BEFORE
:
60
WAIT_AFTER
:
10
0
WAIT_AFTER
:
2
0
WAIT_TIMEOUT
:
300
WAIT_SLEEP_INTERVAL
:
10
icat
:
...
...
@@ -112,3 +112,16 @@ services:
-
MARIADB_DATABASE=${MARIADB_DATABASE}
-
MARIADB_USER=${MARIADB_USER}
-
MARIADB_PASSWORD=${MARIADB_PASSWORD}
mongodb
:
image
:
mongo:latest
restart
:
always
container_name
:
mongodb
environment
:
MONGO_INITDB_ROOT_USERNAME
:
${MONGO_USER}
MONGO_INITDB_ROOT_PASSWORD
:
${MONGO_PASSWORD}
MONGO_INITDB_DATABASE
:
icatplus
command
:
-
'
--logpath'
-
'
/var/log/mongodb/mongod.log'
ports
:
-
27017:27017
This diff is collapsed.
Click to expand it.
icat-plus/.env.test.compose
+
3
−
3
View file @
90c48806
...
...
@@ -2,10 +2,10 @@ LOGBOOK_API_KEY="elogbook-be70ac55-fd08-4840-9b29-b73262958ca8"
ICAT_SERVER_URL="http://icat"
ICAT_SERVER_PORT=8080
MONGO_DB_URL=
MONGO_UNIT_ENABLED=
1
MONGO_DB_URL=
mongodb://mongo:mongo@mongodb:27017/icatplus?authSource=admin
MONGO_UNIT_ENABLED=
0
LOGGING_LEVEL=
0
LOGGING_LEVEL=
silly
ELASTIC_SEARCH_SERVER="localhost:9200"
...
...
This diff is collapsed.
Click to expand it.
icat-plus/Dockerfile
+
1
−
1
View file @
90c48806
...
...
@@ -22,7 +22,7 @@ RUN chmod +x /wait
ADD
.env.test.compose /icat-plus/.env.test.compose
CMD
/wait && git pull origin $CI_COMMIT_SHA && npm run configure:all && npm
$NPM_COMMAND
CMD
/wait && git pull origin $CI_COMMIT_SHA && npm run configure:all && npm
start && tail -f /dev/null
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment