From c44d7de1437bd6a3053e615bd7596c8c53d35402 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 16 May 2023 10:07:08 +0200 Subject: [PATCH] dockerfile update --- docker/dev-ssu/Dockerfile | 15 ++++++++------- docker/prod-ssu/Dockerfile | 12 +++++++++--- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/docker/dev-ssu/Dockerfile b/docker/dev-ssu/Dockerfile index e8724828e..eac8cb289 100644 --- a/docker/dev-ssu/Dockerfile +++ b/docker/dev-ssu/Dockerfile @@ -1,13 +1,14 @@ FROM serversideup/php:8.2-fpm-nginx ARG POSTGRES_VERSION=15 RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs postgresql-client -RUN apt-get -y autoremove \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* +RUN apt-get -y autoremove && + apt-get clean && + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -RUN echo "alias ll='ls -al'" >> /etc/bash.bashrc -RUN echo "alias a='php artisan'" >> /etc/bash.bashrc -RUN echo "alias mfs='php artisan migrate:fresh --seed'" >> /etc/bash.bashrc -RUN echo "alias cda='composer dump-autoload'" >> /etc/bash.bashrc +RUN echo "alias ll='ls -al'" >>/etc/bash.bashrc +RUN echo "alias a='php artisan'" >>/etc/bash.bashrc +RUN echo "alias mfs='php artisan migrate:fresh --seed'" >>/etc/bash.bashrc +RUN echo "alias cda='composer dump-autoload'" >>/etc/bash.bashrc +RUN echo "alias run='./scripts/run'" >>/etc/bash.bashrc # COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/ diff --git a/docker/prod-ssu/Dockerfile b/docker/prod-ssu/Dockerfile index 1f87a6923..122508482 100644 --- a/docker/prod-ssu/Dockerfile +++ b/docker/prod-ssu/Dockerfile @@ -8,9 +8,9 @@ FROM serversideup/php:8.2-fpm-nginx WORKDIR /var/www/html ARG POSTGRES_VERSION=15 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/* +RUN apt-get -y autoremove && + apt-get clean && + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* COPY composer.json composer.lock ./ RUN composer install --no-dev --no-interaction --no-plugins --no-scripts --prefer-dist @@ -23,3 +23,9 @@ COPY --chmod=755 docker/prod-ssu/etc/s6-overlay/ /etc/s6-overlay/ RUN php artisan route:cache RUN php artisan view:cache + +RUN echo "alias ll='ls -al'" >>/etc/bash.bashrc +RUN echo "alias a='php artisan'" >>/etc/bash.bashrc +RUN echo "alias mfs='php artisan migrate:fresh --seed'" >>/etc/bash.bashrc +RUN echo "alias cda='composer dump-autoload'" >>/etc/bash.bashrc +RUN echo "alias run='./scripts/run'" >>/etc/bash.bashrc