fix: an issue with the generic environment

feat: add support for custom http/s port for traefik

VERSION.txt

@@ -1 +1 @@
-v0.3.23-beta
+v0.3.24-beta

docs/settings/reward-settings.md

@@ -46,12 +46,16 @@ It's possible to change service container images using the following vars.
 - `reward_elastichq_image: "elastichq/elasticsearch-hq"`
 - `reward_adminer_image: "dehy/adminer"`
 
-You can configure Traefik to bind additional http ports on top of the default port (80).
+You can change the default Traefik http and https ports using the following vars.
 
-- `reward_traefik_bind_additional_http_ports: []` - valid option example: `[8080, 8081]`
+- `reward_traefik_http_port: "80"`
+- `reward_traefik_https_port: "443"`
 
-You can configure Traefik to bind additional https ports on top of the default port (443).
+You can also add additional http and https ports on top of the defaults (80, 443). This is useful when you want to
+expose a service on a different port than the default ones. See more info in
+the [Open Ports](../configuration/open-additional-port.html) section.
 
+- `reward_traefik_bind_additional_http_ports: []` - valid option example: `[8080, 8081]`
 - `reward_traefik_bind_additional_https_ports: []` - valid option example: `[8443, 9443]`
 
 By default, Reward makes it possible to resolve the environment's domain to the nginx container's IP address inside the

internal/commands/install.go

@@ -69,6 +69,10 @@ debug: false
 # Reward >= v0.2.34 uses the internally built "docker.io/rewardenv/sshd"
 #reward_tunnel_image: "docker.io/rewardenv/sshd"
 
+# Override default traefik ports
+#reward_traefik_http_port: 80
+#reward_traefik_https_port: 443
+
 # You can configure Traefik to bind additional http ports on top of the default port (80).
 # reward_traefik_bind_additional_http_ports: [8080]
 reward_traefik_bind_additional_http_ports: []

templates/_services/docker-compose.yml

@@ -1,23 +1,23 @@
 {{- /* @formatter:off */ -}}
 
-{{- $traefik_listen := .traefik_listen -}}
+{{- $reward_traefik_listen := .reward_traefik_listen -}}
 
 version: "3.5"
 services:
   traefik:
     container_name: traefik
-    image: {{ default "traefik" .reward_traefik_image }}:{{ default "2.2" .traefik_version }}
+    image: {{ default "traefik" .reward_traefik_image }}:{{ default "2.2" .reward_traefik_version }}
     ports:
-      - "{{ default "127.0.0.1" .traefik_listen }}:80:80"     # The HTTP port
-      - "{{ default "127.0.0.1" .traefik_listen }}:443:443"   # The HTTPS port
+      - "{{ default "127.0.0.1" $reward_traefik_listen }}:{{ default "80" .reward_traefik_http_port }}:{{ default "80" .reward_traefik_http_port }}"     # The HTTP port
+      - "{{ default "127.0.0.1" $reward_traefik_listen }}:{{ default "443" .reward_traefik_https_port }}:{{ default "443" .reward_traefik_https_port }}"   # The HTTPS port
 {{- if .reward_traefik_bind_additional_http_ports -}}
 {{- range $i, $v := .reward_traefik_bind_additional_http_ports }}
-      {{- printf `- "%s:%d:%d"` (default "127.0.0.1" $traefik_listen) $v $v | nindent 6 -}}
+      {{- printf `- "%s:%d:%d"` (default "127.0.0.1" $reward_traefik_listen) $v $v | nindent 6 -}}
 {{- end -}}
 {{- end -}}
 {{- if .reward_traefik_bind_additional_https_ports -}}
 {{- range $i, $v := .reward_traefik_bind_additional_https_ports }}
-      {{- printf `- "%s:%d:%d"` (default "127.0.0.1" $traefik_listen) $v $v | nindent 6 -}}
+      {{- printf `- "%s:%d:%d"` (default "127.0.0.1" $reward_traefik_listen) $v $v | nindent 6 -}}
 {{- end -}}
 {{- end }}
     volumes:

templates/_traefik/traefik.yml

@@ -12,14 +12,14 @@ providers:
     exposedByDefault: false
 entryPoints:
   http:
-    address: ":80"
+    address: ":{{ default "80" .reward_traefik_http_port }}"
     http:
       redirections:
         entryPoint:
           to: https
           scheme: https
   https:
-    address: ":443"
+    address: ":{{ default "443" .reward_traefik_https_port }}"
 {{- if .reward_traefik_bind_additional_http_ports -}}
 {{- range $i, $v := .reward_traefik_bind_additional_http_ports }}
   {{- printf "http-additional-%d:" $v | nindent 2 -}}

templates/environments/generic-php/generic-php.base.yml

@@ -2,8 +2,8 @@
 
 version: "3.5"
 services:
-  nginx:
+  nginx: {}
 
-  php-fpm:
+  php-fpm: {}
 
-  php-debug:
+  php-debug: {}