From 894145a39ff9476674dd4d25152693a1b0cb4329 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Wed, 7 Oct 2020 02:42:29 -0400
Subject: [PATCH] Fixed some bugs in the container preventing startup
---
README.md | 7 +++----
docker-compose.yml | 10 ++++++----
run.sh | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 3c00a5e..9908e5f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Opertes in two modes, `proxy` and `redirect
See also `docker-compose.yml` file.
-
#### General Options
The following engiernment variables can be set in any mode.
@@ -61,9 +60,9 @@ docker-compose up -d
With `docker`
```bash
-docker run -e SERVER_REDIRECT=www.example.com -p 8888:80 schmunk42/nginx-redirect
-docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -p 8888:80 schmunk42/nginx-redirect
-docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -e SERVER_REDIRECT_SCHEME=https -p 8888:80 schmunk42/nginx-redirect
+docker run -e SERVER_REDIRECT=www.example.com -p 8888:80 qotoorg/nginx-redirect
+docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -p 8888:80 qotoorg/nginx-redirect
+docker run -e SERVER_REDIRECT=www.example.com -e SERVER_REDIRECT_PATH=/landingpage -e SERVER_REDIRECT_SCHEME=https -p 8888:80 qotoorg/nginx-redirect
```
## Resources
diff --git a/docker-compose.yml b/docker-compose.yml
index 5077ecc..947d2b3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,12 @@
nginx-redirect:
- image: qoto/nginx-redirect
- build: .
+ image: qotoorg/nginx-redirect
ports:
- - "8888:80"
+ - "80"
environment:
- - SERVER_REDIRECT=www.example.com
+ - "SERVER_NAME=swarmpit.qoto.org"
+ - "PROXY_HOST=internal.swarm.qoto.org"
+ - "PROXY_PORT=888"
+ #- SERVER_REDIRECT=www.example.com
# optionally define path to redirect all requests
# if not set nginx var $request_uri is used
#- SERVER_REDIRECT_PATH=/landingpage
diff --git a/run.sh b/run.sh
index cc63523..aeadc79 100644
--- a/run.sh
+++ b/run.sh
@@ -30,7 +30,7 @@ if [ -n "$PROXY_HOST" ] ; then
sed -i '/^##START_SSL_SERVER##/,/^##END_SSL_SERVER##/{/^##START_SSL_SERVER##/!{/^##END_SSL_SERVER##/!d}}' /etc/nginx/conf.d/default.conf
sed -i 's/^##[^#]*##$//g' /etc/nginx/conf.d/default.conf
else
- else lets just remove the comment blocks and make it pretty.
+ #else lets just remove the comment blocks and make it pretty.
sed -i 's/^##[^#]*##$//g' /etc/nginx/conf.d/default.conf
fi
--
GitLab