Merge branch 'release-1.3' into release-2.0

Author: corpsee

README.md

@@ -26,13 +26,13 @@ You can use docker-compose file (`docker-compose.yml`) that is described below t
 Default way with PostgreSQL database:
 
 ```
-docker-compose -f docker-compose.yml up -d
+docker-compose -f docker-compose.yml up -d (--build)
 ```
 
 Or if you want to use it with MySQL (MariaDB):
 
 ```
-docker-compose -f docker-compose.mysql.yml up -d
+docker-compose -f docker-compose.mysql.yml up -d (--build)
 ```
 
 If you want to up more worker just use this command, when the PHP Censor stack is already started (but you can do it on

web/Dockerfile

@@ -16,7 +16,7 @@ RUN apk add --no-cache $PHPIZE_DEPS && \
 RUN docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo) pdo pdo_mysql pdo_pgsql ldap zip bcmath && \
     docker-php-ext-enable xdebug
 
-RUN git clone -b $PHPCENSOR_VERSION --single-branch --depth 1 https://github.com/php-censor/php-censor.git .
+RUN git clone -b $PHPCENSOR_VERSION --single-branch --depth 1 https://github.com/php-censor/php-censor.git . && chmod +x ./bin/console
 
 RUN composer install
 
@@ -32,7 +32,7 @@ ENV DB_TYPE=mysql
 ENV DB_NAME=phpcensor
 ENV DB_USER=phpcensor
 ENV DB_PASS=changethepass
-ENV SITE_URL=http://phpcensor.local
+ENV SITE_URL=http://phpcensor.localhost
 ENV BEANSTALK_HOST=localhost
 ENV BEANSTALK_QUEUE_NAME=phpcensor
 

web/entrypoint.sh

@@ -33,11 +33,11 @@ parse_args() {
 # Entrypoint
 main() {
     parse_args
-    
+
     if [ ! -f ./app/config.yml ]; then
         envsubst < /config.tmpl.yml > ./app/config.yml
     fi
-    
+
     wait_for_external_services
 
 

worker/Dockerfile

@@ -16,7 +16,7 @@ RUN apk add --no-cache $PHPIZE_DEPS && \
 RUN docker-php-ext-install -j$(grep -c ^processor /proc/cpuinfo) pdo pdo_mysql pdo_pgsql zip bcmath && \
     docker-php-ext-enable xdebug
 
-RUN git clone -b $PHPCENSOR_VERSION --single-branch --depth 1 https://github.com/php-censor/php-censor.git .
+RUN git clone -b $PHPCENSOR_VERSION --single-branch --depth 1 https://github.com/php-censor/php-censor.git . && chmod +x ./bin/console
 
 RUN composer install