TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix docker errors

Browse Source
This commit is contained in:
Mohit Panjwani
2020-05-27 16:01:37 +05:30
parent 6278417423
commit 165907d144
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -13,11 +13,15 @@ RUN apt-get update && apt-get install -y \
libxml2-dev \ libxml2-dev \
zip \ zip \
unzip \ unzip \
libzip-dev libzip-dev \
libmagickwand-dev
# Clear cache # Clear cache
RUN apt-get clean && rm -rf /var/lib/apt/lists/* RUN apt-get clean && rm -rf /var/lib/apt/lists/*
RUN pecl install imagick \
&& docker-php-ext-enable imagick
# Install PHP extensions # Install PHP extensions
RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd
@ -33,8 +37,3 @@ RUN mkdir -p /home/$user/.composer && \
WORKDIR /var/www WORKDIR /var/www
USER $user USER $user
# COPY ./docker-compose/setup.sh /tmp
# RUN ln -s /usr/local/bin/setup.sh
# ENTRYPOINT ["/tmp/setup.sh"]

13
composer.json
View File

@ -54,20 +54,11 @@
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true, "prefer-stable": true,
"scripts": { "scripts": {
"initial-setup": [
"test -f .env || (cp .env.example .env; php artisan key:generate 2>/dev/null; exit 0)"
],
"pre-install-cmd": [
"@initial-setup"
],
"pre-update-cmd": [
"@initial-setup"
],
"post-root-package-install": [ "post-root-package-install": [
"@initial-setup" "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
], ],
"post-create-project-cmd": [ "post-create-project-cmd": [
"@initial-setup" "php artisan key:generate --ansi"
], ],
"post-autoload-dump": [ "post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",

1
docker-compose.yml
View File

@ -9,7 +9,6 @@ services:
context: ./ context: ./
dockerfile: Dockerfile dockerfile: Dockerfile
image: crater-php image: crater-php
container_name: crater-app
restart: unless-stopped restart: unless-stopped
working_dir: /var/www/ working_dir: /var/www/
volumes: volumes:

8
docker-compose/setup.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
cd /var/www docker-compose exec app composer install --no-interaction --prefer-dist --optimize-autoloader
php artisan storage:link || true docker-compose exec app php artisan storage:link || true
php artisan key:generate docker-compose exec app php artisan key:generate
php artisan passport:keys || true docker-compose exec app php artisan passport:keys || true