diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile index 3314a40ac..4b0c99f6a 100644 --- a/docker/dev-ssu/Dockerfile +++ b/docker/dev-ssu/Dockerfile @@ -1,8 +1,8 @@ FROM serversideup/php:8.2-fpm-nginx ARG POSTGRES_VERSION=15 -RUN apt-get update && apt-get install -y php-pgsql openssh-client +RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs RUN apt-get -y autoremove \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/ +# COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/ diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile deleted file mode 100644 index 1959a9b12..000000000 --- a/docker/dev/Dockerfile +++ /dev/null @@ -1,83 +0,0 @@ -FROM ubuntu:22.04 - -ARG WWWGROUP -ARG TARGETPLATFORM - -ARG NODE_VERSION=18 -ARG POSTGRES_VERSION=14 - -# https://download.docker.com/linux/static/stable/ -ARG DOCKER_VERSION=20.10.18 -# https://github.com/docker/compose/releases -# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug. -ARG DOCKER_COMPOSE_VERSION=2.6.1 -# https://github.com/buildpacks/pack/releases -ARG PACK_VERSION=v0.27.0 - -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 git-lfs supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils \ - && 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-gd \ - 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 \ - && 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 \ - && 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 - - -USER root - -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 - -# Install Docker CLI, Docker Compose, and Pack -RUN mkdir -p ~/.docker/cli-plugins -RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-$DOCKER_VERSION -o /usr/bin/docker -RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-$DOCKER_COMPOSE_VERSION -o ~/.docker/cli-plugins/docker-compose -o /home/sail/.docker/cli-plugins/docker-compose -RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/pack-$PACK_VERSION -o /usr/local/bin/pack -RUN curl -sSL https://nixpacks.com/install.sh | bash - -RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack -RUN chmod +x /usr/local/bin/pack - -RUN mkdir -p /home/sail/.docker/cli-plugins -RUN cp ~/.docker/cli-plugins/docker-compose /home/sail/.docker/cli-plugins/docker-compose -RUN chown -R sail:sail /home/sail - -EXPOSE 8000 - -ENTRYPOINT ["start-container"] diff --git a/docker/dev/php.ini b/docker/dev/php.ini deleted file mode 100644 index 66d04d5be..000000000 --- a/docker/dev/php.ini +++ /dev/null @@ -1,4 +0,0 @@ -[PHP] -post_max_size = 100M -upload_max_filesize = 100M -variables_order = EGPCS diff --git a/docker/dev/start-container b/docker/dev/start-container deleted file mode 100644 index b86439907..000000000 --- a/docker/dev/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/dev/supervisord.conf b/docker/dev/supervisord.conf deleted file mode 100644 index b88d3ffa0..000000000 --- a/docker/dev/supervisord.conf +++ /dev/null @@ -1,42 +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 - -# Run workers by running manually `sail artisan queue:listen` -# -#[program:laravel-worker] -#process_name=%(program_name)s_%(process_num)02d -#command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan queue:listen -#user=sail -#autostart=true -#autorestart=true -#stopasgroup=true -#killasgroup=true -#numprocs=8 -#redirect_stderr=true -#stdout_logfile=/var/www/html/storage/logs/worker.log -#stopwaitsecs=3600 - -[program:laravel-schedule] -process_name=%(program_name)s_%(process_num)02d -command=/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan schedule:work -user=sail -autostart=true -autorestart=true -stopasgroup=true -killasgroup=true -numprocs=1 -redirect_stderr=true -stdout_logfile=/var/www/html/storage/logs/worker.log -stopwaitsecs=3600 diff --git a/docker/staging/Dockerfile b/docker/staging/Dockerfile deleted file mode 100644 index ccfda8f89..000000000 --- a/docker/staging/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM serversideup/php:8.2-fpm-nginx - -ARG NODE_VERSION=18 -ARG POSTGRES_VERSION=15 - -RUN apt-get update \ - && curl -sLS https://deb.nodesource.com/setup_$NODE_VERSION.x | bash - \ - && apt-get install -y nodejs \ - && npm install -g npm - -RUN apt-get install -y php-pgsql openssh-client - -RUN apt-get -y autoremove \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* - -USER root - -# S6 Overlay config -COPY --chmod=755 etc/s6-overlay/ /etc/s6-overlay/ diff --git a/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/run b/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/run deleted file mode 100644 index 23dddd030..000000000 --- a/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/command/execlineb -P -su webuser -c "php /var/www/html/artisan queue:listen --tries=3" diff --git a/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/type b/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/type deleted file mode 100644 index 5883cff0c..000000000 --- a/docker/staging/etc/s6-overlay/s6-rc.d/queue-worker/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/docker/staging/etc/s6-overlay/s6-rc.d/user/contents.d/queue-worker b/docker/staging/etc/s6-overlay/s6-rc.d/user/contents.d/queue-worker deleted file mode 100644 index e69de29bb..000000000