Merge pull request #159 from computerfr33k/master

Add caddy webserver container
This commit is contained in:
Mahmoud Zalt 2016-07-20 07:41:45 +03:00 committed by GitHub
commit 2799a94a9f
4 changed files with 52 additions and 1 deletions

View File

@ -100,6 +100,7 @@ docker-compose up nginx mysql redis
- Memcached
- Beanstalkd
- Beanstalkd Console
- Caddy
- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite, Vim, Nano, cURL and much more)
- Data *(Databases Data Container)*
- Application *(Application Code Container)*
@ -205,7 +206,7 @@ docker-compose up -d nginx mysql
You can select your own combination of container form this list:
`nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`, `data`, `php-fpm`, `application`.
`nginx`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `memcached`, `beanstalkd`, `beanstalkd-console`, `caddy`, `workspace`, `data`, `php-fpm`, `application`.
**Note**: `workspace`, `data`, `php-fpm` and `application` will run automatically in most of the cases.

12
caddy/Caddyfile Normal file
View File

@ -0,0 +1,12 @@
# Docs: https://caddyserver.com/docs/caddyfile
0.0.0.0:80
fastcgi / php-fpm:9000 php
rewrite {
to /index.php?{query}
}
browse
log stdout
errors stdout
# Uncomment to enable TLS (HTTPS)
# Change the first list to listen on port 443 when enabling TLS
#tls self_signed

22
caddy/Dockerfile Normal file
View File

@ -0,0 +1,22 @@
FROM alpine:3.4
MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
LABEL caddy_version="0.9.0" architecture="amd64"
RUN apk update \
&& apk upgrade \
&& apk add tar curl
RUN curl --silent --show-error --fail --location \
--header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
"https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \
| tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
&& mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
&& chmod 0755 /usr/bin/caddy \
&& /usr/bin/caddy -version
EXPOSE 80 443 2015
WORKDIR /var/www/laravel/public
ENTRYPOINT ["caddy"]
CMD ["-conf", "/etc/Caddyfile"]

View File

@ -161,4 +161,20 @@ services:
- /var/lib/neo4j:/var/lib/neo4j/data
- /var/lib/mongo:/data/db
### Caddy Server Container ##################################
# Edit the Caddyfile if needed (./caddy/Caddyfile)
caddy:
build: ./caddy
volumes_from:
- volumes_source
ports:
- "80:80"
- "443:443"
- "2015:2015"
volumes:
- ./caddy/Caddyfile:/etc/Caddyfile
links:
- php-fpm
### Add more Containers below ###############################