Merge branch 'release/0.10.0'

Author: pehbehbeh

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4.5-fpm-alpine3.11
+FROM php:7.4.6-fpm-alpine3.11
 
 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
     PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -90,6 +90,9 @@ COPY ./etc/nginx/ /etc/nginx/
 COPY ./usr/local/etc/php/ /usr/local/etc/php/
 COPY ./usr/local/etc/php-fpm.d/ /usr/local/etc/php-fpm.d/
 
+# copy bin files
+COPY ./usr/local/bin/startup-commands.php /usr/local/bin/
+
 # configure composer
 ENV COMPOSER_ALLOW_SUPERUSER=1 \
     COMPOSER_MEMORY_LIMIT=-1
@@ -104,7 +107,9 @@ RUN yarn config set strict-ssl false && \
 COPY ./home/app/ /home/app/
 COPY ./root/.bashrc /root/
 RUN find /home/app -name "run-*.sh" -exec chmod -v +x {} \;
+RUN chmod +x /home/app/entrypoint.sh
 
 # run the application
+ENTRYPOINT bash /home/app/entrypoint.sh
 CMD /home/app/run-prod.sh
 EXPOSE 8080

README.md

@@ -69,6 +69,37 @@ Make sure to adjust your `.env` accordingly and set `APP_URL` to `http://localho
 
 Run `docker-compose up` to start the services.
 
+### Startup Commands
+
+Further commands can be defined via ENV variable `STARTUP_COMMANDXXX`, which are executed at container start before the actual command.
+
+The commands must be numbered sequentially and start with 1 (e.g. `STARTUP_COMMAND1=command`, `STARTUP_COMMAND2=...`).
+
+```yml
+version: '3.7'
+services:
+  app:
+    image: sourceboat/docker-laravel
+    command: /home/app/run-prod.sh
+    restart: unless-stopped
+    environment:
+      - PHP_OPCACHE_VALIDATE_TIMESTAMPS=1
+      - PHP_MEMORY_LIMIT=1G
+      - STARTUP_COMMAND1=php artisan migrate --force
+      - STARTUP_COMMAND2=php artisan horizon:restart
+    volumes:
+      - ./:/opt/app:cached
+    ports:
+      - "8080:8080"
+    depends_on:
+      - mysql
+  mysql:
+    image: mysql:8.0
+    environment:
+      - "MYSQL_ROOT_PASSWORD=secret"
+      - "MYSQL_DATABASE=default"
+```
+
 ### Production
 
 `WIP`
@@ -80,6 +111,7 @@ Check [releases](https://github.com/sourceboat/docker-laravel/releases) for all
 ## Credits
 
 - [Phil-Bastian Berndt](https://github.com/pehbehbeh)
+- [Philipp Kübler](https://github.com/PKuebler)
 - [All Contributors](https://github.com/sourceboat/docker-laravel/graphs/contributors)
 
 ## License

home/app/entrypoint.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+echo "Running entrypoint script..."
+
+set -e
+
+# make sure Laravel can write its own files
+mkdir -p /opt/app/storage/logs/
+touch /opt/app/storage/logs/laravel.log
+touch /opt/app/storage/logs/worker.log
+chown www-data:www-data -R /opt/app/storage
+chown www-data:www-data -R /opt/app/bootstrap/cache
+
+# create storage symlink
+echo "create storage symlink..."
+su www-data -s /bin/sh -c "php artisan storage:link -q"
+
+# startup commands
+php /usr/local/bin/startup_commands.php | bash
+
+cd /opt/app
+
+"$@"

home/app/run-dev.sh

@@ -2,16 +2,6 @@
 echo "Running via DEV script..."
 cd /opt/app
 
-# make sure Laravel can write its own files
-mkdir -p /opt/app/storage/logs/
-touch /opt/app/storage/logs/laravel.log
-touch /opt/app/storage/logs/worker.log
-chown www-data:www-data -R /opt/app/storage
-chown www-data:www-data -R /opt/app/bootstrap/cache
-
-# create storage symlink
-php artisan storage:link
-
 # install dependencies
 composer install --prefer-dist --no-progress --no-interaction
 yarn

home/app/run-prod.sh

@@ -2,13 +2,6 @@
 echo "Running via PROD script..."
 cd /opt/app
 
-# make sure Laravel can write its own files
-mkdir -p /opt/app/storage/logs/
-touch /opt/app/storage/logs/laravel.log
-touch /opt/app/storage/logs/worker.log
-chown www-data:www-data -R /opt/app/storage
-chown www-data:www-data -R /opt/app/bootstrap/cache
-
 # migrate and setup database
 if [ -z "$DB_HOST" ]; then
   wait-for-it.sh $DB_HOST
@@ -21,8 +14,5 @@ php artisan config:cache
 php artisan route:cache
 php artisan view:cache
 
-# restart the Horizon supervisors
-php artisan horizon:restart
-
 # start the services
 exec runsvdir /etc/service

usr/local/bin/startup-commands.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * A very simple script in charge of generating the startup commands based on environment variables.
+ * The script is run on each start of the container.
+ *
+ * MIT License
+ *
+ * Copyright (c) 2018 TheCodingMachine
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+$commands = array_filter($_SERVER, function(string $key) {
+    return strpos($key, 'STARTUP_COMMAND') === 0;
+}, ARRAY_FILTER_USE_KEY);
+
+ksort($commands);
+
+echo "set -e\n";
+
+
+// Let's run the commands as user $UID if env variable UID is set.
+
+foreach ($commands as $command) {
+    $line = $command;
+    if (isset($_SERVER['UID'])) {
+        $line = 'sudo -E -u \\#'.$_SERVER['UID'].' bash -c '.escapeshellarg($line);
+    }
+    echo $line."\n";
+}