Skip to content

Commit

Permalink
test with latest docker image
Browse files Browse the repository at this point in the history
  • Loading branch information
simonebogni committed Dec 30, 2022
1 parent c60d2bd commit 4a24c5c
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
yarn-error.log
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
[*.yml]
indent_size = 2
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
/storage/*.key
/vendor
.env
.env.backup
.phpunit.result.cache
docker-compose.override.yml
Homestead.json
Homestead.yaml
npm-debug.log
Expand Down
65 changes: 15 additions & 50 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,55 +1,20 @@
FROM ubuntu:20.04
FROM richarvey/nginx-php-fpm:latest

LABEL maintainer="Taylor Otwell"
COPY . .

ARG WWWGROUP
# Image config
ENV SKIP_COMPOSER 1
ENV WEBROOT /var/www/html/public
ENV PHP_ERRORS_STDERR 1
ENV RUN_SCRIPTS 1
ENV REAL_IP_HEADER 1

WORKDIR /var/www/html
# Laravel config
ENV APP_ENV production
ENV APP_DEBUG false
ENV LOG_CHANNEL stderr

ENV DEBIAN_FRONTEND noninteractive
ENV TZ=UTC
# Allow composer to run as root
ENV COMPOSER_ALLOW_SUPERUSER 1

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 \
&& mkdir -p ~/.gnupg \
&& chmod 600 ~/.gnupg \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E5267A6C \
&& apt-key adv --homedir ~/.gnupg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C300EE8C \
&& echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
&& apt-get update \
&& apt-get install -y php8.0-cli php8.0-dev \
php8.0-pgsql php8.0-sqlite3 php8.0-gd \
php8.0-curl php8.0-memcached \
php8.0-imap php8.0-mysql php8.0-mbstring \
php8.0-xml php8.0-zip php8.0-bcmath php8.0-soap \
php8.0-intl php8.0-readline \
php8.0-msgpack php8.0-igbinary php8.0-ldap \
php8.0-redis \
&& php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \
&& curl -sL https://deb.nodesource.com/setup_15.x | bash - \
&& apt-get install -y nodejs \
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
&& apt-get update \
&& apt-get install -y yarn \
&& apt-get install -y mysql-client \
&& 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.0

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.0/cli/conf.d/99-sail.ini
RUN chmod +x /usr/local/bin/start-container

EXPOSE 8000

ENTRYPOINT ["start-container"]
CMD ["/start.sh"]
2 changes: 1 addition & 1 deletion conf/nginx/nginx-site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ server {
location ~ /\.(?!well-known).* {
deny all;
}
}
}
4 changes: 0 additions & 4 deletions php.ini

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/00-laravel-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ echo "Caching routes..."
php artisan route:cache

echo "Running migrations..."
php artisan migrate --force && php artisan db:seed --force
php artisan migrate --force
17 changes: 0 additions & 17 deletions start-container

This file was deleted.

14 changes: 0 additions & 14 deletions supervisord.conf

This file was deleted.

0 comments on commit 4a24c5c

Please sign in to comment.