diff --git a/Dockerfile b/Dockerfile index 7ae2345b4..9db9da03f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,6 @@ RUN \ zlib-dev \ brotli - #ca-certificates \ - # software-properties-common wget git openssl make zip unzip libbrotli-dev libz-dev - RUN docker-php-ext-install sockets RUN \ @@ -100,27 +97,26 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN \ apk update && apk add --no-cache --virtual .deps \ - bash \ make \ automake \ autoconf \ gcc \ g++ \ - libwebp \ certbot \ - htop \ - procps \ + # libwebp \ + # htop \ + # procps \ docker \ - oniguruma-dev \ + # oniguruma-dev \ curl-dev \ imagemagick \ imagemagick-libs \ imagemagick-dev \ yaml-dev \ && pecl install imagick yaml \ - && docker-php-ext-enable imagick yaml - -RUN docker-php-ext-install sockets curl opcache pdo pdo_mysql + && docker-php-ext-enable imagick yaml \ + && docker-php-ext-install sockets opcache pdo_mysql \ + && apk del make automake autoconf gcc g++ curl-dev imagemagick imagemagick-libs imagemagick-dev yaml-dev WORKDIR /usr/src/code diff --git a/bin/doctor b/bin/doctor index 0fe5965da..022a4d8a5 100755 --- a/bin/doctor +++ b/bin/doctor @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh php /usr/src/code/app/tasks/init.php doctor \ No newline at end of file diff --git a/bin/migrate b/bin/migrate index e6de4a193..509512fae 100755 --- a/bin/migrate +++ b/bin/migrate @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh php /usr/src/code/app/tasks/migrate.php run \ No newline at end of file diff --git a/bin/schedule b/bin/schedule index a9b05916f..74da3fe1e 100644 --- a/bin/schedule +++ b/bin/schedule @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler \ No newline at end of file diff --git a/bin/start b/bin/start index bde1101b4..7dd4ecddc 100755 --- a/bin/start +++ b/bin/start @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh export PHP_VERSION=$PHP_VERSION diff --git a/bin/test b/bin/test index 1f0296c9a..61f606b15 100755 --- a/bin/test +++ b/bin/test @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh /usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml \ No newline at end of file diff --git a/bin/worker-audits b/bin/worker-audits index 3befdbc04..99b3eac2e 100644 --- a/bin/worker-audits +++ b/bin/worker-audits @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-certificates b/bin/worker-certificates index f2a1bde94..6d360aff3 100644 --- a/bin/worker-certificates +++ b/bin/worker-certificates @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-deletes b/bin/worker-deletes index 6c623bfd4..d053381db 100644 --- a/bin/worker-deletes +++ b/bin/worker-deletes @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-functions b/bin/worker-functions index 55290c992..787addab0 100644 --- a/bin/worker-functions +++ b/bin/worker-functions @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-functions' APP_INCLUDE='/usr/src/code/app/workers/functions.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-mails b/bin/worker-mails index 7c6ae5f91..8a1a9de97 100644 --- a/bin/worker-mails +++ b/bin/worker-mails @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-tasks b/bin/worker-tasks index 1474dd286..236b34cb7 100644 --- a/bin/worker-tasks +++ b/bin/worker-tasks @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-usage b/bin/worker-usage index c570eeed7..2b967f8f0 100644 --- a/bin/worker-usage +++ b/bin/worker-usage @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file diff --git a/bin/worker-webhooks b/bin/worker-webhooks index 9686961a9..d09a4a39a 100644 --- a/bin/worker-webhooks +++ b/bin/worker-webhooks @@ -1,3 +1,3 @@ -#!/bin/bash +#!/bin/sh QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php \ No newline at end of file