viveksantayana/ska-referee-test
viveksantayana/ska-referee-test
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 19 Wiki Activity

Merge

Browse Source
This commit is contained in:
Vivek Santayana 2021-12-07 13:37:12 +00:00
commit ecf18a70a8
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -145,5 +145,8 @@ dev/
out/ out/
ref-test/testing.py ref-test/testing.py
# Ignore Database
database/data/
# Ignore Encryption Keyfile # Ignore Encryption Keyfile
.encryption.key .encryption.key

13
docker-compose.yml
View File

@ -22,11 +22,6 @@ services:
ref_test_app: ref_test_app:
container_name: ref_test_app container_name: ref_test_app
build: ./ref-test build: ./ref-test
<<<<<<< HEAD
volumes:
- ./ref-test:/ref-test
=======
>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
env_file: env_file:
- ./.env - ./.env
ports: ports:
@ -44,11 +39,7 @@ services:
image: mongo:5.0.4-focal image: mongo:5.0.4-focal
restart: unless-stopped restart: unless-stopped
volumes: volumes:
<<<<<<< HEAD
- ./database/data:/data
=======
- ./database/data:/data/db - ./database/data:/data/db
>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
- ./database/initdb.d/:/docker-entrypoint-initdb.d/ - ./database/initdb.d/:/docker-entrypoint-initdb.d/
env_file: env_file:
- ./.env - ./.env
@ -76,11 +67,7 @@ services:
- ./src/html:/var/www/html - ./src/html:/var/www/html
depends_on: depends_on:
- ref_test_server - ref_test_server
<<<<<<< HEAD
# command: certonly --webroot --webroot-path=/var/www/html --email vsdomainmanager@gmail.com --agree-tos --no-eff-email -d reftest.vsnt.uk
=======
# command: certonly --webroot --webroot-path=/var/www/html --email (email) --agree-tos --no-eff-email -d (domain) # command: certonly --webroot --webroot-path=/var/www/html --email (email) --agree-tos --no-eff-email -d (domain)
>>>>>>> 9462d7aa7f14b379766503503fd3ba08e1469574
networks: networks:
frontend: frontend: