component/web: Add 'HTTPSMETHOD'

This commit sets the 'HTTPSMETHOD' variable on the 'web' component for
when https is or is not enabled.
This commit is contained in:
Tom Wiesing 2022-09-11 13:04:15 +02:00
parent e1ee569629
commit 2ee90bf462
No known key found for this signature in database
4 changed files with 11 additions and 3 deletions

View file

@ -5,6 +5,7 @@ services:
image: ghcr.io/nginx-proxy/nginx-proxy:alpine
environment:
- DEFAULT_HOST=${DEFAULT_HOST}
- HTTPS_METHOD=${HTTPS_METHOD}
ports:
- "80:80"
- "443:443"

View file

@ -1 +1,2 @@
DEFAULT_HOST=${DEFAULT_HOST}
DEFAULT_HOST=${DEFAULT_HOST}
HTTPS_METHOD=${HTTPS_METHOD}

View file

@ -17,9 +17,15 @@ func (WebComponent) Name() string {
}
func (web WebComponent) Stack() stack.Installable {
HTTPS_METHOD := "nohttp"
if web.dis.HTTPSEnabled() {
HTTPS_METHOD = "redirect"
}
return web.dis.makeComponentStack(web, stack.Installable{
EnvContext: map[string]string{
"DEFAULT_HOST": web.dis.Config.DefaultDomain,
"HTTPS_METHOD": HTTPS_METHOD,
},
})
}

View file

@ -55,9 +55,9 @@ func (ds Stack) Update(io stream.IOStream, start bool) error {
var errStackUp = errors.New("Stack.Up: Up returned non-zero exit code")
// Up creates and starts the containers in this Stack.
// It is equivalent to 'docker compose up -d' on the shell.
// It is equivalent to 'docker compose up --remove-orphans --detach' on the shell.
func (ds Stack) Up(io stream.IOStream) error {
code, err := ds.compose(io, "up", "-d")
code, err := ds.compose(io, "up", "--remove-orphans", "--detach")
if err != nil {
return err
}