diff --git a/README.md b/README.md index eb1f0aab..448d8aaf 100644 --- a/README.md +++ b/README.md @@ -426,13 +426,13 @@ traefik: host_port: 8080 ``` -### Additional entrypoints for traefik +### Configure entrypoints for traefik -You can configure additional ports and entrypoints for traefik list so: +You can override the ports and entrypoints for traefik list so: ```yaml traefik: - additional_ports: + ports: - 9000 - 9001 args: @@ -455,7 +455,8 @@ labels: traefik.http.services.myservice.loadbalancer.server.port: 8080 traefik: - additional_ports: + ports: + - 80 - 9000 args: 'entrypoints.web.address=:80': true diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index acda3cf5..a6e2e229 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -8,8 +8,7 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base "--detach", "--restart", "unless-stopped", "--log-opt", "max-size=#{MAX_LOG_SIZE}", - "--publish", port, - *additional_ports, + *published_ports, "--volume", "/var/run/docker.sock:/var/run/docker.sock", "traefik", "--providers.docker", @@ -55,11 +54,11 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base end private - def additional_ports - if args = config.raw_config.dig(:traefik, "additional_ports") + def published_ports + if args = config.raw_config.dig(:traefik, "ports") args.collect { |value| "--publish #{value}:#{value}" }.compact else - [] + ["--publish #{port}"] end end diff --git a/test/commands/traefik_test.rb b/test/commands/traefik_test.rb index 58d0a557..300565c0 100644 --- a/test/commands/traefik_test.rb +++ b/test/commands/traefik_test.rb @@ -19,14 +19,14 @@ class CommandsTraefikTest < ActiveSupport::TestCase new_command.run.join(" ") end - test "run with additional entrypoints" do + test "run with ports configured" do assert_equal \ "docker run --name traefik --detach --restart unless-stopped --log-opt max-size=10m --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format \"json\" --metrics.prometheus.buckets \"0.1,0.3,1.2,5.0\"", new_command.run.join(" ") - @config[:traefik]["additional_ports"] = %w[9000 9001] + @config[:traefik]["ports"] = %w[9000 9001] assert_equal \ - "docker run --name traefik --detach --restart unless-stopped --log-opt max-size=10m --publish 80:80 --publish 9000:9000 --publish 9001:9001 --volume /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format \"json\" --metrics.prometheus.buckets \"0.1,0.3,1.2,5.0\"", + "docker run --name traefik --detach --restart unless-stopped --log-opt max-size=10m --publish 9000:9000 --publish 9001:9001 --volume /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format \"json\" --metrics.prometheus.buckets \"0.1,0.3,1.2,5.0\"", new_command.run.join(" ") end