diff --git a/docker-compose.yml b/docker-compose.yml index 072fc1a18..4b8381cf3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -# For more information: https://laravel.com/docs/sail version: '3' services: laravel.test: @@ -23,59 +22,42 @@ services: networks: - sail depends_on: - # - mysql - # - pgsql - - mailhog - # mysql: - # image: 'mysql/mysql-server:8.0' - # ports: - # - '${FORWARD_DB_PORT:-3306}:3306' - # environment: - # MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' - # MYSQL_ROOT_HOST: "%" - # MYSQL_DATABASE: '${DB_DATABASE}' - # MYSQL_USER: '${DB_USERNAME}' - # MYSQL_PASSWORD: '${DB_PASSWORD}' - # MYSQL_ALLOW_EMPTY_PASSWORD: 1 - # volumes: - # - 'sail-mysql:/var/lib/mysql' - # - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' - # networks: - # - sail - # healthcheck: - # test: ["CMD", "mysqladmin", "ping", "-p${DB_PASSWORD}"] - # retries: 3 - # timeout: 5s - # pgsql: - # image: 'postgres:14' - # ports: - # - '${FORWARD_DB_PORT:-5432}:5432' - # environment: - # PGPASSWORD: '${DB_PASSWORD:-secret}' - # POSTGRES_DB: '${DB_DATABASE}' - # POSTGRES_USER: '${DB_USERNAME}' - # POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}' - # volumes: - # - 'sail-pgsql:/var/lib/postgresql/data' - # - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql' - # networks: - # - sail - # healthcheck: - # test: ["CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}"] - # retries: 3 - # timeout: 5s - mailhog: - image: 'mailhog/mailhog:latest' + - mysql + - mailpit + mysql: + image: 'mysql/mysql-server:8.0' ports: - - '${FORWARD_MAILHOG_PORT:-1025}:1025' - - '${FORWARD_MAILHOG_DASHBOARD_PORT:-8025}:8025' + - '${FORWARD_DB_PORT:-3306}:3306' + environment: + MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' + MYSQL_ROOT_HOST: '%' + MYSQL_DATABASE: '${DB_DATABASE}' + MYSQL_USER: '${DB_USERNAME}' + MYSQL_PASSWORD: '${DB_PASSWORD}' + MYSQL_ALLOW_EMPTY_PASSWORD: 1 + volumes: + - 'sail-mysql:/var/lib/mysql' + - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh' + networks: + - sail + healthcheck: + test: + - CMD + - mysqladmin + - ping + - '-p${DB_PASSWORD}' + retries: 3 + timeout: 5s + mailpit: + image: 'axllent/mailpit:latest' + ports: + - '${FORWARD_MAILPIT_PORT:-1025}:1025' + - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' networks: - sail networks: sail: driver: bridge -# volumes: - # sail-mysql: - # driver: local - # sail-pgsql: - # driver: local +volumes: + sail-mysql: + driver: local diff --git a/docker/8.1/Dockerfile b/docker/8.1/Dockerfile index 20f19b315..2b50361c9 100644 --- a/docker/8.1/Dockerfile +++ b/docker/8.1/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 -LABEL maintainer="Alexander Justesen" +LABEL maintainer="Alex Justesen" ARG WWWGROUP ARG NODE_VERSION=18 @@ -14,51 +14,45 @@ ENV TZ=UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN apt-get update \ - && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 cron \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils cron \ && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \ && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ && apt-get update \ && apt-get install -y php8.1-cli php8.1-dev \ - php8.1-pgsql php8.1-sqlite3 php8.1-gd \ + php8.1-pgsql php8.1-sqlite3 \ php8.1-curl \ - php8.1-imap php8.1-mysql php8.1-mbstring \ + php8.1-mysql php8.1-mbstring \ php8.1-xml php8.1-zip php8.1-bcmath php8.1-soap \ php8.1-intl php8.1-readline \ - php8.1-ldap \ - php8.1-msgpack php8.1-igbinary php8.1-redis php8.1-swoole \ - php8.1-memcached php8.1-pcov php8.1-xdebug \ - && php -r "readfile('https://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \ + php8.1-msgpack php8.1-igbinary php8.1-redis \ + php8.1-memcached php8.1-pcov php8.1-xdebug + +RUN php -r "readfile('https://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \ && curl -sLS https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \ && apt-get install -y nodejs \ && npm install -g npm \ - # && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr/share/keyrings/yarn.gpg >/dev/null \ - # && echo "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \ && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \ && echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ && apt-get update \ - # && apt-get install -y yarn \ && apt-get install -y mysql-client \ && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \ + && apt-get update \ + && apt-get install -y speedtest \ && apt-get -y autoremove \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \ - && apt-get install -y speedtest + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && echo "MAILTO=\"\"\n* * * * * sail /usr/bin/php /var/www/html/artisan schedule:run" > /etc/cron.d/laravel RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.1 RUN groupadd --force -g $WWWGROUP sail RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail -COPY cron/scheduler /etc/cron.d/scheduler COPY start-container /usr/local/bin/start-container COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY php.ini /etc/php/8.1/cli/conf.d/99-sail.ini - -RUN chmod 0644 /etc/cron.d/scheduler \ - && crontab /etc/cron.d/scheduler \ - && chmod +x /usr/local/bin/start-container +RUN chmod +x /usr/local/bin/start-container EXPOSE 8000 diff --git a/docker/8.1/cron/scheduler b/docker/8.1/cron/scheduler deleted file mode 100644 index e25013252..000000000 --- a/docker/8.1/cron/scheduler +++ /dev/null @@ -1,2 +0,0 @@ -MAILTO="" -* * * * * sail cd /var/www/html && php artisan schedule:run >> /dev/null 2>&1 diff --git a/docker/8.1/php.ini b/docker/8.1/php.ini index 236bb7c1d..66d04d5be 100644 --- a/docker/8.1/php.ini +++ b/docker/8.1/php.ini @@ -1,4 +1,4 @@ [PHP] -post_max_size = 200M -upload_max_filesize = 200M +post_max_size = 100M +upload_max_filesize = 100M variables_order = EGPCS diff --git a/docker/8.2/Dockerfile b/docker/8.2/Dockerfile new file mode 100644 index 000000000..b16da4fde --- /dev/null +++ b/docker/8.2/Dockerfile @@ -0,0 +1,59 @@ +FROM ubuntu:22.04 + +LABEL maintainer="Alex Justesen" + +ARG WWWGROUP +ARG NODE_VERSION=18 +ARG POSTGRES_VERSION=14 + +WORKDIR /var/www/html + +ENV DEBIAN_FRONTEND noninteractive +ENV TZ=UTC + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +RUN apt-get update \ + && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils cron \ + && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \ + && apt-get update \ + && apt-get install -y php8.2-cli php8.2-dev \ + php8.2-pgsql php8.2-sqlite3 \ + php8.2-curl \ + php8.2-mysql php8.2-mbstring \ + php8.2-xml php8.2-zip php8.2-bcmath php8.2-soap \ + php8.2-intl php8.2-readline \ + php8.2-msgpack php8.2-igbinary php8.2-redis \ + php8.2-memcached php8.2-pcov php8.2-xdebug + +RUN php -r "readfile('https://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \ + && curl -sLS https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \ + && apt-get install -y nodejs \ + && npm install -g npm \ + && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/pgdg.gpg >/dev/null \ + && echo "deb [signed-by=/usr/share/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ + && apt-get update \ + && apt-get install -y mysql-client \ + && apt-get install -y postgresql-client-$POSTGRES_VERSION \ + && curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \ + && apt-get update \ + && apt-get install -y speedtest \ + && apt-get -y autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && echo "MAILTO=\"\"\n* * * * * sail /usr/bin/php /var/www/html/artisan schedule:run" > /etc/cron.d/laravel + +RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.2 + +RUN groupadd --force -g $WWWGROUP sail +RUN useradd -ms /bin/bash --no-user-group -g $WWWGROUP -u 1337 sail + +COPY start-container /usr/local/bin/start-container +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY php.ini /etc/php/8.2/cli/conf.d/99-sail.ini +RUN chmod +x /usr/local/bin/start-container + +EXPOSE 8000 + +ENTRYPOINT ["start-container"] diff --git a/docker/8.2/php.ini b/docker/8.2/php.ini new file mode 100644 index 000000000..66d04d5be --- /dev/null +++ b/docker/8.2/php.ini @@ -0,0 +1,4 @@ +[PHP] +post_max_size = 100M +upload_max_filesize = 100M +variables_order = EGPCS diff --git a/docker/8.2/start-container b/docker/8.2/start-container new file mode 100644 index 000000000..b86439907 --- /dev/null +++ b/docker/8.2/start-container @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +if [ ! -z "$WWWUSER" ]; then + usermod -u $WWWUSER sail +fi + +if [ ! -d /.composer ]; then + mkdir /.composer +fi + +chmod -R ugo+rw /.composer + +if [ $# -gt 0 ]; then + exec gosu $WWWUSER "$@" +else + exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf +fi diff --git a/docker/8.2/supervisord.conf b/docker/8.2/supervisord.conf new file mode 100644 index 000000000..2067142ca --- /dev/null +++ b/docker/8.2/supervisord.conf @@ -0,0 +1,21 @@ +[supervisord] +nodaemon=true +user=root +logfile=/var/log/supervisor/supervisord.log +pidfile=/var/run/supervisord.pid + +[program:cron] +command=/usr/sbin/cron -f -l 8 +user=root +autostart=true +stdout_logfile=/var/log/cron.out.log +stderr_logfile=/var/log/cron.err.log + +[program:php] +command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80 +user=sail +environment=LARAVEL_SAIL="1" +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0