From d0ea582fa28d3e6087a8f5a1821119ad59ca5764 Mon Sep 17 00:00:00 2001 From: mike Date: Thu, 28 Dec 2023 02:28:15 +0100 Subject: [PATCH] Rm redundant dir --- docker/.gitignore => dev/.gitkeep | 0 docker/8.2/Dockerfile | 65 ------------------------------- docker/8.2/php.ini | 7 ---- docker/8.2/scheduler | 1 - docker/8.2/start-container | 17 -------- docker/8.2/supervisord.conf | 27 ------------- 6 files changed, 117 deletions(-) rename docker/.gitignore => dev/.gitkeep (100%) delete mode 100644 docker/8.2/Dockerfile delete mode 100644 docker/8.2/php.ini delete mode 100644 docker/8.2/scheduler delete mode 100644 docker/8.2/start-container delete mode 100644 docker/8.2/supervisord.conf diff --git a/docker/.gitignore b/dev/.gitkeep similarity index 100% rename from docker/.gitignore rename to dev/.gitkeep diff --git a/docker/8.2/Dockerfile b/docker/8.2/Dockerfile deleted file mode 100644 index 7188ed9..0000000 --- a/docker/8.2/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -FROM ubuntu:22.04 - -LABEL maintainer="Taylor Otwell" - -ARG WWWGROUP -ARG NODE_VERSION=18 -ARG POSTGRES_VERSION=15 - -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 cron - -RUN apt-get update \ - && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils \ - && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /etc/apt/keyrings/ppa_ondrej_php.gpg > /dev/null \ - && echo "deb [signed-by=/etc/apt/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-gd php8.2-imagick \ - php8.2-curl \ - php8.2-imap 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-ldap \ - php8.2-msgpack php8.2-igbinary php8.2-redis php8.2-swoole \ - php8.2-memcached php8.2-pcov php8.2-xdebug \ - && curl -sLS 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 /etc/apt/keyrings/yarn.gpg >/dev/null \ - && echo "deb [signed-by=/etc/apt/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 /etc/apt/keyrings/pgdg.gpg >/dev/null \ - && echo "deb [signed-by=/etc/apt/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 \ - && apt-get -y autoremove \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -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 scheduler /etc/cron.d/scheduler -RUN chmod 0644 /etc/cron.d/scheduler \ - && crontab /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.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 deleted file mode 100644 index 39dcbca..0000000 --- a/docker/8.2/php.ini +++ /dev/null @@ -1,7 +0,0 @@ -[PHP] -post_max_size = 100M -upload_max_filesize = 100M -variables_order = EGPCS - -[opcache] -opcache.enable_cli=1 diff --git a/docker/8.2/scheduler b/docker/8.2/scheduler deleted file mode 100644 index 69e95f1..0000000 --- a/docker/8.2/scheduler +++ /dev/null @@ -1 +0,0 @@ -* * * * * root cd /var/www/html && php artisan schedule:run >> /dev/null 2>&1 diff --git a/docker/8.2/start-container b/docker/8.2/start-container deleted file mode 100644 index b864399..0000000 --- a/docker/8.2/start-container +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 deleted file mode 100644 index 684a4e8..0000000 --- a/docker/8.2/supervisord.conf +++ /dev/null @@ -1,27 +0,0 @@ -[supervisord] -nodaemon=true -user=root -logfile=/var/log/supervisor/supervisord.log -pidfile=/var/run/supervisord.pid - -[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 - -[program:cron] -command=/usr/sbin/cron -f -l 8 -autostart=true -stdout_logfile=/var/log/cron.out.log -stderr_logfile=/var/log/cron.err.log - -[program:horizon] -command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan horizon -user=sail -stdout_logfile=/var/log/horizon.out.log -stderr_logfile=/var/log/horizon.err.log -