Merge pull request #123 from itk-dev/feature/rename_traefik_entrypoints

Feature/rename traefik entrypoints

Author: turegjorup

scripts/itkdev-docker-compose

@@ -41,7 +41,7 @@ function self_update {
   git checkout "$branch"
   git pull
 
-  echo "${bold}Done.${normal}"
+  echo "${bold}Done. Please run traefik:pull to ensure you have the latest containers.${normal}"
 
   echo
   echo "Latest changes:"
@@ -264,16 +264,22 @@ Commands:
                 Update template installed in project.
 
   traefik:start
-                Start træfik reverse proxy.
+                Start traefik reverse proxy.
 
   traefik:stop
-                Stop træfik reverse proxy
+                Stop traefik reverse proxy
 
   traefik:url
-                URL for the administrative UI for træfik.
+                URL for the administrative UI for traefik.
 
   traefik:open
-                Open the administrative UI for træfik.
+                Open the administrative UI for traefik.
+
+  traefik:logs
+                See traefik logs
+
+  traefik:pull
+                Pull latest traefik & socket-proxy containers
 
   mail:url
                 URL for the test mail web interface.
@@ -474,6 +480,12 @@ if [[ "$#" -gt "0" && "$1" == "traefik:stop" ]]; then
   exit
 fi
 
+# Allow traefik:pull without existence of .env
+if [[ "$#" -gt "0" && "$1" == "traefik:pull" ]]; then
+  $(cd ${script_dir}/../traefik/; docker compose pull)
+  exit
+fi
+
 # Allow dory:start without existence of .env
 if [[ "$#" -gt "0" && "$1" == "dory:start" ]]; then
   if [ "$(docker inspect -f '{{.State.Running}}' traefik 2>/dev/null)" == "true" ]; then
@@ -728,6 +740,11 @@ EOF
     echo http://${url}:8080;
     ;;
 
+  traefik:logs)
+    echo "docker logs --tail 20 traefik"
+    docker logs --tail 20 traefik
+    ;;
+
   mail:url)
     url="http://${COMPOSE_DOMAIN}:$(docker_compose port mail 8025 | cut -d: -f2)"
     echo $url

traefik/traefik.yml

@@ -5,9 +5,9 @@ api:
   disableDashboardAd: true
 
 entryPoints:
-  http:
+  web:
     address: ":80"
-  https:
+  websecure:
     address: ":443"
     http:
       tls: {}