Skip to content

Commit

Permalink
Merge pull request #64 from ISnackable/isnackable-patch-2
Browse files Browse the repository at this point in the history
Add docker persistence data & Fix frontend image alt attribute
  • Loading branch information
Gavebean authored Jul 18, 2021
2 parents 24f02af + 56b7d56 commit eca083f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 8 additions & 4 deletions G8/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ services:
# MariaDB Database
mariadb:
image: mariadb:10
# mounting a named volume to the container to track db data
volumes:
- mariadb_data:/var/lib/mysql
- ./backend/init.sql:/docker-entrypoint-initdb.d/init.sql
Expand Down Expand Up @@ -39,6 +40,10 @@ services:
# UNCOMMENT TO SPECIFY A CODEQL CLI VERSION, defaults to latest version
# CODEQL_VERSION: "v2.5.7"
PRECOMPILE_QUERIES: "true" # FALSE TO REDUCE CREATION TIME
volumes:
- backend_uploads:/uploads/
- backend_database:/databases/
- backend_sarif:/SarifFiles/
environment:
CODEQL_HOME: /usr/local/codeql-home
DB_HOST: mariadb
Expand All @@ -63,9 +68,6 @@ services:
# ports:
# - 7474:7474
# - 7687:7687
# mounting a named volume to the container to track db data
volumes:
- neo4j_data:/data/
environment:
- NEO4J_AUTH=neo4j/s3cr3t # configure the instance with custom username/password
# Raise memory limits
Expand All @@ -75,5 +77,7 @@ services:

# volumes to be generated, these are saved somewhere for repeated use by docker
volumes:
neo4j_data:
mariadb_data:
backend_uploads:
backend_database:
backend_sarif:
6 changes: 3 additions & 3 deletions G8/frontend/src/pages/Presentation.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ select sink.getNode(), source, sink,
</Button>
</Col>
<Col lg={6} className="order-lg-1">
<Image src={ReactMockupImg} alt="Calendar Preview" />
<Image src={ReactMockupImg} alt="React Mockup" />
</Col>
</Row>
<Row className="justify-content-between align-items-center mb-5 mb-lg-7">
Expand All @@ -285,7 +285,7 @@ select sink.getNode(), source, sink,
</Button>
</Col>
<Col lg={6} className="order-lg-1">
<Image src={ExpressMockupImg} alt="Calendar Preview" />
<Image src={ExpressMockupImg} alt="Express Mockup" />
</Col>
</Row>
{/* codeql feature */}
Expand Down Expand Up @@ -418,7 +418,7 @@ select sink.getNode(), source, sink,
<Col lg={6} className="order-lg-1">
<Image
src={Neo4JImage}
alt="MapBox Leaflet.js Custom Integration Mockup"
alt="Neo4J Mockup"
/>
</Col>
</Row>
Expand Down

0 comments on commit eca083f

Please sign in to comment.