diff --git a/Dockerfile b/Dockerfile index d7ee16d..c3dbd58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM scratch +EXPOSE 10000 COPY --from=build /etc/sablier/themes /etc/sablier/themes COPY --from=build /src/sablier* /bin/sablier COPY docker/sablier.yaml /etc/sablier/sablier.yaml diff --git a/plugins/traefik/e2e/docker/docker-compose.yml b/plugins/traefik/e2e/docker/docker-compose.yml index 3de700b..d24aa9d 100644 --- a/plugins/traefik/e2e/docker/docker-compose.yml +++ b/plugins/traefik/e2e/docker/docker-compose.yml @@ -24,34 +24,6 @@ services: - --logging.level=trace volumes: - '/var/run/docker.sock:/var/run/docker.sock' - labels: - - traefik.enable=true - # Dynamic Middleware - - traefik.http.middlewares.dynamic.plugin.sablier.names=docker_classic_e2e-whoami-1 - - traefik.http.middlewares.dynamic.plugin.sablier.sablierUrl=http://sablier:10000 - - traefik.http.middlewares.dynamic.plugin.sablier.sessionDuration=1m - - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.DisplayName=Dynamic Whoami - - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.theme=hacker-terminal - # Blocking Middleware - - traefik.http.middlewares.blocking.plugin.sablier.names=docker_classic_e2e-whoami-1 - - traefik.http.middlewares.blocking.plugin.sablier.sablierUrl=http://sablier:10000 - - traefik.http.middlewares.blocking.plugin.sablier.sessionDuration=1m - - traefik.http.middlewares.blocking.plugin.sablier.blocking.timeout=30s - # Multiple Dynamic Middleware - - traefik.http.middlewares.multiple.plugin.sablier.names=docker_classic_e2e-whoami-1,docker_classic_e2e-nginx-1 - - traefik.http.middlewares.multiple.plugin.sablier.sablierUrl=http://sablier:10000 - - traefik.http.middlewares.multiple.plugin.sablier.sessionDuration=1m - - traefik.http.middlewares.multiple.plugin.sablier.dynamic.displayName=Multiple Whoami - # Healthy Middleware - - traefik.http.middlewares.healthy.plugin.sablier.names=docker_classic_e2e-nginx-1 - - traefik.http.middlewares.healthy.plugin.sablier.sablierUrl=http://sablier:10000 - - traefik.http.middlewares.healthy.plugin.sablier.sessionDuration=1m - - traefik.http.middlewares.healthy.plugin.sablier.dynamic.displayName=Healthy Nginx - # Group Middleware - - traefik.http.middlewares.group.plugin.sablier.group=E2E - - traefik.http.middlewares.group.plugin.sablier.sablierUrl=http://sablier:10000 - - traefik.http.middlewares.group.plugin.sablier.sessionDuration=1m - - traefik.http.middlewares.group.plugin.sablier.dynamic.displayName=Group E2E whoami: image: acouvreur/whoami:v1.10.2 diff --git a/plugins/traefik/e2e/docker/dynamic-config.yml b/plugins/traefik/e2e/docker/dynamic-config.yml index e7643b5..c98c352 100644 --- a/plugins/traefik/e2e/docker/dynamic-config.yml +++ b/plugins/traefik/e2e/docker/dynamic-config.yml @@ -15,7 +15,7 @@ http: entryPoints: - "http" middlewares: - - dynamic@docker + - dynamic@file service: "whoami" whoami-blocking: @@ -23,7 +23,7 @@ http: entryPoints: - "http" middlewares: - - blocking@docker + - blocking@file service: "whoami" whoami-multiple: @@ -31,7 +31,7 @@ http: entryPoints: - "http" middlewares: - - multiple@docker + - multiple@file service: "whoami" nginx-multiple: @@ -39,7 +39,7 @@ http: entryPoints: - "http" middlewares: - - multiple@docker + - multiple@file service: "nginx" nginx-healthy: @@ -47,7 +47,7 @@ http: entryPoints: - "http" middlewares: - - healthy@docker + - healthy@file service: "nginx" group: @@ -55,5 +55,49 @@ http: entryPoints: - "http" middlewares: - - group@docker - service: "whoami" \ No newline at end of file + - group@file + service: "whoami" + + middlewares: + dynamic: + plugin: + sablier: + names: docker_classic_e2e-whoami-1 + sablierUrl: http://sablier:10000 + sessionDuration: 1m + dynamic: + displayName: Dynamic Whoami + theme: hacker-terminal + blocking: + plugin: + sablier: + names: docker_classic_e2e-whoami-1 + sablierUrl: http://sablier:10000 + sessionDuration: 1m + blocking: + timeout: 30s + multiple: + plugin: + sablier: + names: docker_classic_e2e-whoami-1,docker_classic_e2e-nginx-1 + sablierUrl: http://sablier:10000 + sessionDuration: 1m + dynamic: + displayName: Multiple Whoami + theme: hacker-terminal + healthy: + plugin: + sablier: + names: docker_classic_e2e-nginx-1 + sablierUrl: http://sablier:10000 + sessionDuration: 1m + dynamic: + displayName: Healthy Nginx + group: + plugin: + sablier: + group: E2E + sablierUrl: http://sablier:10000 + sessionDuration: 1m + dynamic: + displayName: Group E2E \ No newline at end of file