Skip to content

Commit

Permalink
Merge pull request #23 from EmakinaFR/feature/composer
Browse files Browse the repository at this point in the history
Improve deployment through Composer
  • Loading branch information
ajardin authored Oct 23, 2018
2 parents 3020d41 + a266a8b commit 265abb9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/.circleci/ export-ignore
/.github/ export-ignore
/docs/ export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/CODE_OF_CONDUCT.md export-ignore
1 change: 0 additions & 1 deletion CODEOWNERS

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ cache: ## Flush cache stored in Redis
docker-compose exec redis sh -c "redis-cli -n 2 FLUSHDB"

composer: ## Install Composer dependencies from the "php" container
$(PHP_SERVICE) "composer install -o --working-dir=$(PROJECT_PATH)"
$(PHP_SERVICE) "composer install --optimize-autoloader --prefer-dist --working-dir=$(PROJECT_PATH)"

logs: ## Follow logs generated by all containers
docker-compose logs -f --tail=0
Expand Down
11 changes: 2 additions & 9 deletions composer_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,8 @@ else
exit 1
fi

# Copy only required files to the project directory
mkdir -p "$1"/docker
cp -r "${script_path}"/elasticsearch "$1"/docker/
cp -r "${script_path}"/nginx "$1"/docker/
cp -r "${script_path}"/php "$1"/docker/
cp "${script_path}"/.dockerignore "$1"/docker/
cp "${script_path}"/.env.dist "$1"/docker/
cp "${script_path}"/docker-compose.yml "$1"/docker/
cp "${script_path}"/Makefile "$1"/docker/
# Copy environment files to the project directory
cp -r "${script_path}" "$1"/docker

# Install the Makefile in the project directory
if [[ ! -f "$1"/Makefile ]]; then
Expand Down

0 comments on commit 265abb9

Please sign in to comment.