summaryrefslogtreecommitdiffstats
path: root/.examples
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2017-08-14 15:32:08 +0200
committerTilo Spannagel <development@tilosp.de>2017-09-27 13:29:13 +0200
commitb120af8e7f8a150ca01cc847753579987364c55a (patch)
treed728c3357d1a10695963408e81c64236bfb8a5a6 /.examples
parentf1515a32dcfe731f480d137a350f1c259a9ebf38 (diff)
Add Dockerfile for nginx
Diffstat (limited to '.examples')
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml3
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf (renamed from .examples/docker-compose/insecure/mariadb-cron-redis/fpm/nginx.conf)0
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml3
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf (renamed from .examples/docker-compose/insecure/mariadb/fpm/nginx.conf)0
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml3
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile3
-rw-r--r--.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf (renamed from .examples/docker-compose/insecure/postgres/fpm/nginx.conf)0
9 files changed, 12 insertions, 6 deletions
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index ce557947..f9a663c3 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -25,13 +25,12 @@ services:
- db.env
web:
- image: nginx
+ build: ./web
restart: always
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- - ./nginx.conf:/etc/nginx/nginx.conf:ro
cron:
build: ./app
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
new file mode 100644
index 00000000..d6eac3e8
--- /dev/null
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/nginx.conf b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
index c23a7707..c23a7707 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/web/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index 9ae7c155..4bd01822 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -21,13 +21,12 @@ services:
- db.env
web:
- image: nginx
+ build: ./web
restart: always
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- - ./nginx.conf:/etc/nginx/nginx.conf:ro
volumes:
db:
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
new file mode 100644
index 00000000..d6eac3e8
--- /dev/null
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
index c23a7707..c23a7707 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index b3b0d3ab..85f24587 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -18,13 +18,12 @@ services:
- db.env
web:
- image: nginx
+ build: ./web
restart: always
ports:
- 8080:80
volumes:
- nextcloud:/var/www/html:ro
- - ./nginx.conf:/etc/nginx/nginx.conf:ro
volumes:
db:
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
new file mode 100644
index 00000000..d6eac3e8
--- /dev/null
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
@@ -0,0 +1,3 @@
+FROM nginx
+
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/fpm/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
index c23a7707..c23a7707 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf