Updates Development files

This commit is contained in:
Sam ONeill 2023-04-15 22:57:10 +12:00
parent 57bd2b4174
commit e9ce7c0fa9
4 changed files with 6 additions and 7 deletions

View file

@ -1,4 +1,3 @@
PROJECT_ROOT=""
DOMAIN="" DOMAIN=""
# Emails from Let's Encrypt about your certificate will go here # Emails from Let's Encrypt about your certificate will go here
LE_EMAIL="" LE_EMAIL=""

View file

@ -2,13 +2,12 @@
# preserve original production files # preserve original production files
mv ./docker-compose.yml ./docker-compose.production.yml mv ./docker-compose.yml ./docker-compose.production.yml
mv ./pathfinder.Dockerfile ./pathfinder.Dockerfile.production
mv ./static/pathfinder/environment.ini ./static/pathfinder/environment.production.ini mv ./static/pathfinder/environment.ini ./static/pathfinder/environment.production.ini
mv ./static/php/php.ini ./static/php/php.production.ini mv ./static/php/php.ini ./static/php/php.production.ini
# copy development versions # copy development versions
cp ./development/docker-compose.development.yml ./docker-compose.yml cp ./development/docker-compose.development.yml ./docker-compose.yml
cp ./development/pathfinder.Dockerfile.developm ./pathfinder.Dockerfile cp ./development/pathfinder.Dockerfile.development ./Dockerfile
cp ./development/environment.development.ini ./static/pathfinder/environment.ini cp ./development/environment.development.ini ./static/pathfinder/environment.ini
cp ./development/php.development.ini ./static/php/php.ini cp ./development/php.development.ini ./static/php/php.ini
cp ./development/xdebug.ini ./static/php/xdebug.ini cp ./development/xdebug.ini ./static/php/xdebug.ini
@ -24,7 +23,6 @@ while true; do
esac esac
done done
if [ ! "$NO_ENV" == "true" ]; then if [ ! "$NO_ENV" == "true" ]; then
echo "PROJECT_ROOT=\"$(pwd)\"" > ./.env cp ./development/.env.development ./.env
cat ./development/.env.development >> ./.env
echo "WARNING: .env has been replaced, remember to fill any required variables" echo "WARNING: .env has been replaced, remember to fill any required variables"
fi fi

View file

@ -11,7 +11,7 @@ services:
- "$MYSQL_HOST" - "$MYSQL_HOST"
volumes: volumes:
- db_data:/var/lib/mysql - db_data:/var/lib/mysql
- $PROJECT_ROOT/pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip - ./pathfinder/export/sql/eve_universe.sql.zip:/eve_universe.sql.zip
restart: always restart: always
pf-redis: pf-redis:
image: redis:6.2.5-alpine3.14 image: redis:6.2.5-alpine3.14
@ -37,7 +37,9 @@ services:
restart: always restart: always
pf: pf:
hostname: "pathfinder" hostname: "pathfinder"
build: '.' build:
context: '.'
dockerfile: pathfinder.Dockerfile
env_file: env_file:
- .env - .env
labels: labels: