mirror of
https://github.com/openclassify/openclassify.git
synced 2026-01-11 18:01:10 -06:00
Docker - Smooth installation conditions
This commit is contained in:
parent
1d1d08ea07
commit
bad7d2130a
@ -3,7 +3,7 @@ APP_ENV=local
|
||||
INSTALLED="false"
|
||||
APP_KEY=DYKEBxfEHK1PP4mUbP3gWPtsPZgXh0qX
|
||||
APP_DEBUG=true
|
||||
DEBUG_BAR=false
|
||||
DEBUG_BAR=true
|
||||
DB_CONNECTION=mysql
|
||||
#DB_HOST=mysql
|
||||
DB_HOST=hostdocker.internal
|
||||
|
||||
@ -17,8 +17,8 @@ RUN docker-php-ext-install pdo pdo_mysql bcmath curl opcache
|
||||
RUN docker-php-ext-enable opcache
|
||||
|
||||
WORKDIR /var/www
|
||||
|
||||
COPY --chown=www-data:www-data . .
|
||||
|
||||
COPY --chown=www-data:www-data --chmod=777 . .
|
||||
|
||||
COPY ./docker/php/php.ini /usr/local/etc/php/php.ini
|
||||
COPY ./docker/php/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
|
||||
@ -28,8 +28,8 @@ COPY ./docker/nginx/site.conf /etc/nginx/default.conf
|
||||
|
||||
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
||||
|
||||
RUN chmod -R 755 /var/www/storage
|
||||
RUN chmod -R 755 /var/www/bootstrap
|
||||
RUN chmod -R 777 /var/www/storage
|
||||
RUN chmod -R 777 /var/www/bootstrap
|
||||
|
||||
#ENTRYPOINT [ "docker/entrypoint.sh" ]
|
||||
|
||||
|
||||
@ -57,10 +57,7 @@
|
||||
"anomaly/navigation-module": "~2.4.0",
|
||||
"anomaly/dashboard-module": "~2.2.0",
|
||||
"anomaly/redirects-module": "~2.3.0",
|
||||
"anomaly/variables-module": "~2.4.0",
|
||||
"anomaly/settings-module": "~2.4.0",
|
||||
"anomaly/blocks-module": "~1.3.0",
|
||||
"anomaly/search-module": "~3.0.0",
|
||||
"anomaly/users-module": "~2.5.0",
|
||||
"anomaly/pages-module": "~2.6.0",
|
||||
"anomaly/posts-module": "~2.6.0",
|
||||
@ -78,8 +75,6 @@
|
||||
"sentry/sentry-laravel": "2.3.1",
|
||||
"composer/composer": "2.*",
|
||||
"visiosoft/composer-merge-plugin": "2.*",
|
||||
"pusher/pusher-php-server": "^5.0",
|
||||
"simplepie/simplepie": "^1.5.0",
|
||||
"guzzlehttp/guzzle": "^7.3",
|
||||
"visiosoft/connect-module": "^1.0",
|
||||
"visiosoft/singlefile-field_type": "^1.0",
|
||||
@ -94,7 +89,6 @@
|
||||
"visiosoft/advs-module": "^1.0",
|
||||
"visiosoft/json-field_type": "^1.0",
|
||||
"visiosoft/language_switcher-plugin": "^1.0",
|
||||
"fruitcake/laravel-cors": "^2.0",
|
||||
"visiosoft/global_helper-extension": "*"
|
||||
},
|
||||
"replace": {
|
||||
@ -104,9 +98,7 @@
|
||||
"filp/whoops": "~2.0",
|
||||
"fzaninotto/faker": "~1.4",
|
||||
"symfony/css-selector": "3.1.*",
|
||||
"symfony/dom-crawler": "3.1.*",
|
||||
"anomaly/installer-module": "~2.4.0",
|
||||
"laravel/sail": "^1.14"
|
||||
"symfony/dom-crawler": "3.1.*"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
|
||||
@ -39,6 +39,8 @@ services:
|
||||
depends_on:
|
||||
database:
|
||||
condition: service_healthy
|
||||
env_file: .env
|
||||
|
||||
|
||||
# Database Server
|
||||
database:
|
||||
|
||||
@ -5,7 +5,7 @@ echo "$APP_ENV"
|
||||
if [ ! -f "vendor/autoload.php" ]; then
|
||||
composer install --no-progress --no-interaction
|
||||
else
|
||||
echo " nothing to do."
|
||||
echo "composer. nothing to do."
|
||||
fi
|
||||
|
||||
if [ ! -f ".env" ]; then
|
||||
@ -19,7 +19,6 @@ fi
|
||||
role=${CONTAINER_ROLE:-app}
|
||||
|
||||
if [ "$role" = "app" ]; then
|
||||
#INSTALLED=$(. ./.env; printf '%s' "$INSTALLED")
|
||||
if [ "$INSTALLED" = "false" ]; then
|
||||
echo ".env installed is false starting installing"
|
||||
composer update
|
||||
|
||||
Loading…
Reference in New Issue
Block a user