Skip to content
This repository has been archived by the owner on Aug 31, 2022. It is now read-only.

Commit

Permalink
Merge pull request #202 from nekochans/release/v1.0.11
Browse files Browse the repository at this point in the history
Release/v1.0.11
  • Loading branch information
keitakn authored Jun 17, 2019
2 parents 21c7559 + c6f2e47 commit 82d8282
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
3 changes: 3 additions & 0 deletions buildspec-push-ecr.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: 0.2

phases:
install:
runtime-versions:
docker: 18
pre_build:
commands:
- echo Logging in to Amazon ECR...
Expand Down
1 change: 1 addition & 0 deletions docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM nginx:1.15.5-alpine
ENV PHP_HOST=127.0.0.1

ADD ./docker/nginx/config/default.conf.template /etc/nginx/conf.d/default.conf.template
ADD ./docker/nginx/config/nginx.conf /etc/nginx/nginx.conf

RUN mkdir -p /var/www/html/public
ADD ./public/ /var/www/html/public
Expand Down
31 changes: 31 additions & 0 deletions docker/nginx/config/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
user nginx;
worker_processes 1;

error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;

events {
worker_connections 65535;
multi_accept on;
use epoll;
}

http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

#gzip on;

include /etc/nginx/conf.d/*.conf;
}

0 comments on commit 82d8282

Please sign in to comment.