Skip to content

Commit

Permalink
fixes for makefile on a new machine
Browse files Browse the repository at this point in the history
  • Loading branch information
V13Axel committed Jul 4, 2024
1 parent 0c79d27 commit d1f2eeb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
11 changes: 11 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ services:
- "MIXVERSION=true"
- "NODE_OPTIONS=--max-old-space-size=4096"

composer:
image: fc-bref-composer
build:
context: .
dockerfile: setup/php/composer.Dockerfile
user: "${FC_USER_ID:-1000}:${FC_GROUP_ID:-1000}"
volumes:
- .:/var/task
command: ["composer", "install"]


mailpit:
image: 'axllent/mailpit:latest'
ports:
Expand Down
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ quick_deploy_prod:
install_dev:
cp ./setup/docker.example.env .env || true # Copy env file, don't overwrite
docker-compose build # Gotta build our images before we can use them
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm install # NPM install inside docker container to avoid installing on host
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/var/task" -v ${COMPOSER_HOME:-$HOME/.composer}:/tmp -e COMPOSER_CACHE_DIR=/tmp/composer-cache -w /var/task fc-bref-composer composer install # Composer install inside docker container (it has all our required PHP modules)
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/app" -w /app node:20 npm install --legacy-peer-deps # NPM install inside docker container to avoid installing on host
docker run -it -u $(id -u):$(id -g) -v "${PWD}/:/var/task" -e COMPOSER_CACHE_DIR=/tmp/composer-cache -w /var/task fc-bref-composer composer install # Composer install inside docker container (it has all our required PHP modules)
docker-compose up -d # Start up our docker containers
until docker-compose exec php php artisan migrate:status; do sleep 1; done # Wait for mysql to be ready
docker-compose exec php php artisan migrate:fresh --seed # Run migrations
Expand Down
Empty file modified public/images/icons.svg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d1f2eeb

Please sign in to comment.