diff --git a/.env.example b/.env.example index 69dd81e..35c267f 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,3 @@ -PROJECT_ROOT="" DOMAIN="" # Emails from Let's Encrypt about your certificate will go here LE_EMAIL="" diff --git a/development/development.sh b/development/development.sh index 894ad48..bfed9be 100755 --- a/development/development.sh +++ b/development/development.sh @@ -2,13 +2,12 @@ # preserve original production files 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/php/php.ini ./static/php/php.production.ini # copy development versions 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/php.development.ini ./static/php/php.ini cp ./development/xdebug.ini ./static/php/xdebug.ini @@ -24,7 +23,6 @@ while true; do esac done if [ ! "$NO_ENV" == "true" ]; then - echo "PROJECT_ROOT=\"$(pwd)\"" > ./.env - cat ./development/.env.development >> ./.env + cp ./development/.env.development ./.env echo "WARNING: .env has been replaced, remember to fill any required variables" fi diff --git a/development/docker-compose.development.yml b/development/docker-compose.development.yml index 1d10f58..267bc44 100644 --- a/development/docker-compose.development.yml +++ b/development/docker-compose.development.yml @@ -11,7 +11,7 @@ services: - "$MYSQL_HOST" volumes: - 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 pf-redis: image: redis:6.2.5-alpine3.14 @@ -37,7 +37,9 @@ services: restart: always pf: hostname: "pathfinder" - build: '.' + build: + context: '.' + dockerfile: pathfinder.Dockerfile env_file: - .env labels: diff --git a/development/pathfinder.Dockerfile.develop b/development/pathfinder.Dockerfile.development similarity index 100% rename from development/pathfinder.Dockerfile.develop rename to development/pathfinder.Dockerfile.development