Skip to content

Commit

Permalink
add docker configuration for localhost development
Browse files Browse the repository at this point in the history
  • Loading branch information
tibor-postek-m2ms committed Mar 18, 2020
1 parent 14dbc9b commit d62d907
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 19 deletions.
Empty file modified docker-compose.dev.yml
100644 → 100755
Empty file.
31 changes: 21 additions & 10 deletions docker-compose.localhost.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
container_name: neo4j
image: neo4j
ports:
# Comment these two out in produciton
# Comment these two out in production
- "7474:7474"
- "7687:7687"
ulimits:
Expand All @@ -36,7 +36,7 @@ services:
volumes:
- ../data/logs:/code/logs/
- ../data/media:/code/media/
- ../fragalysis-frontend:/code/frontend
- ../fragalysis-frontend:/code/frontend/
- ../fragalysis-backend:/code/
ports:
- "8080:80"
Expand All @@ -45,15 +45,26 @@ services:
- graph
loader:
container_name: loader
image: loader:latest
image: xchem/fragalysis-stack:latest
command: /bin/bash /code/docker-entrypoint.sh
volumes:
- ../data/input:/fragalysis
- ../data/media:/code/media
- ../data/input:/fragalysis/
- ../data/media:/code/media/
- ../fragalysis-frontend:/code/frontend/
- ../fragalysis-backend:/code/
- ../dls-fragalysis-stack-openshift/images/loader/docker-entrypoint.sh:/code/docker-entrypoint.sh
- ../fragalysis-loader/run_loader.sh:/code/run_loader.sh
- ../fragalysis-loader/loader.py:/code/loader.py
- ../fragalysis-loader/test_entry.sh:/code/test_entry.sh
- ../fragalysis-loader/wait-for-it.sh:/code/wait-for-it.sh
- ../fragalysis-loader/database_check.py:/code/database_check.py
- ../fragalysis-loader/tests:/code/tests
- ../fragalysis-loader/loader:/code/loader
environment:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: django_db
MYSQL_PASSWORD: django_password
MYSQL_USER: django
DATA_ORIGIN: EXAMPLE
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: django_db
MYSQL_PASSWORD: django_password
MYSQL_USER: django
DATA_ORIGIN: EXAMPLE
depends_on:
- mysql
9 changes: 6 additions & 3 deletions js/components/projects/projectModal/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,17 @@ export const ProjectModal = memo(({ history }) => {
}}
onSubmit={values => {
const data = {
...values,
authorID: DJANGO_CONTEXT['pt'],
title: values.title,
description: values.description,
targetID: values.targetId,
author: DJANGO_CONTEXT['pk'],
tags
};
dispatch(setProjectModalIsLoading(true));
api({ url: `${base_url}/api/project`, method: METHOD.POST, data })
api({ url: `${base_url}/api/projects`, method: METHOD.POST, data })
.then(response => {
const projectID = response.data.id;
// create project_target relationShip on BE
history.push(`${URLS.projects}${projectID}`);
})
.catch(error => {
Expand Down
9 changes: 3 additions & 6 deletions js/components/snapshot/redux/dispatchActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,9 @@ export const createInitialSnapshot = projectId => async (dispatch, getState) =>
const snapshot = { objectsInView, nglOrientations, viewParams };
const snapshotDetail = {
type: SnapshotType.INIT,
name: 'Initial Snapshot',
author: {
username: DJANGO_CONTEXT.username,
email: DJANGO_CONTEXT.email
},
message: 'Auto generated initial snapshot',
title: 'Initial Snapshot',
authorID: DJANGO_CONTEXT.pk,
description: 'Auto generated initial snapshot',
children: null,
parent: null,
created: moment()
Expand Down
Empty file modified package.json
100644 → 100755
Empty file.

0 comments on commit d62d907

Please sign in to comment.