fix(tests): using acouvreur/whoami:v1.10.2 instead of containous/whoa…

…mi:v1.5.0 This image simply retrieve the curl binary from curlimages/curl:8.8.0 to be able to add proper docker healthcheck commands. Once this is merged with traefik/whoami, I'll update back to the original image. See traefik/whoami#33
sablierapp · Jul 7, 2024 · b71b8f8 · b71b8f8
1 parent df61724
commit b71b8f8
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 29 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       - traefik.http.middlewares.group.plugin.sablier.blocking.timeout=30s
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     # Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
     # The route doesn't exist anymore. Use dynamic-config.yml file instead.
     # labels:

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -43,7 +43,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
 ```
 
 #### **Caddyfile**
@@ -75,7 +75,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
 
   sablier:
     image: acouvreur/sablier:1.8.0-beta.8
@@ -110,7 +110,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
 
   sablier:
     image: acouvreur/sablier:1.8.0-beta.8
@@ -139,7 +139,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile:ro
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     labels:
       - sablier.enable=true
       - sablier.group=demo

diff --git a/docs/plugins/traefik.md b/docs/plugins/traefik.md
@@ -26,7 +26,7 @@ You have to use the dynamic config file provider instead.
 
 ```yaml
 whoami:
-  image: containous/whoami:v1.5.0
+  image: acouvreur/whoami:v1.10.2
   labels:
     - traefik.enable
     - traefik.http.routers.whoami.rule=PathPrefix(`/whoami`)
@@ -66,7 +66,7 @@ See also [`traefik.docker.lbswarm`](https://doc.traefik.io/traefik/routing/provi
 ```yaml
 services:
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     deploy:
       replicas: 0
       labels:

diff --git a/docs/providers/docker.md b/docs/providers/docker.md
@@ -51,7 +51,7 @@ You have to register your containers by opting-in with labels.
 ```yaml
 services:
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     labels:
       - sablier.enable=true
       - sablier.group=mygroup

diff --git a/docs/providers/docker_swarm.md b/docs/providers/docker_swarm.md
@@ -52,7 +52,7 @@ You have to register your services by opting-in with labels.
 ```yaml
 services:
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     deploy:
       labels:
         - sablier.enable=true

diff --git a/docs/providers/kubernetes.md b/docs/providers/kubernetes.md
@@ -88,7 +88,7 @@ spec:
     spec:
       containers:
       - name: whoami
-        image: containous/whoami:v1.5.0
+        image: acouvreur/whoami:v1.10.2
 ```
 
 ## How does Sablier knows when a deployment is ready?

diff --git a/plugins/caddy/e2e/docker/docker-compose.yml b/plugins/caddy/e2e/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/caddy/e2e/docker_swarm/docker-stack.yml b/plugins/caddy/e2e/docker_swarm/docker-stack.yml
@@ -24,7 +24,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/nginx/e2e/docker/docker-compose.yml b/plugins/nginx/e2e/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/nginx/e2e/docker_swarm/docker-stack.yml b/plugins/nginx/e2e/docker_swarm/docker-stack.yml
@@ -26,7 +26,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/nginx/e2e/kubernetes/manifests/deployment.yml b/plugins/nginx/e2e/kubernetes/manifests/deployment.yml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: whoami
-        image: containous/whoami:v1.5.0
+        image: acouvreur/whoami:v1.10.2
 ---
 apiVersion: v1
 kind: Service

diff --git a/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml b/plugins/proxywasm/e2e/apacheapisix/docker/compose.yaml
@@ -19,7 +19,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/proxywasm/e2e/envoy/docker/compose.yaml b/plugins/proxywasm/e2e/envoy/docker/compose.yaml
@@ -18,7 +18,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/proxywasm/e2e/istio/kubernetes/manifests/whoami.yml b/plugins/proxywasm/e2e/istio/kubernetes/manifests/whoami.yml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: whoami
-        image: containous/whoami:v1.5.0
+        image: acouvreur/whoami:v1.10.2
 ---
 apiVersion: v1
 kind: Service

diff --git a/plugins/proxywasm/e2e/nginx/docker/compose.yaml b/plugins/proxywasm/e2e/nginx/docker/compose.yaml
@@ -19,7 +19,7 @@ services:
       - '/var/run/docker.sock:/var/run/docker.sock'
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/traefik/README.md b/plugins/traefik/README.md
@@ -94,7 +94,7 @@ services:
       - traefik.http.middlewares.dynamic.plugin.sablier.dynamic.sessionDuration=1m
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     # Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
     # The route doesn't exist anymore. Use dynamic-config.yml file instead.
     # labels:
@@ -130,7 +130,7 @@ http:
     ```yaml
     services:
       whoami:
-        image: containous/whoami:v1.5.0
+        image: acouvreur/whoami:v1.10.2
         deploy:
           replicas: 0
           labels:

diff --git a/plugins/traefik/e2e/docker/docker-compose.yml b/plugins/traefik/e2e/docker/docker-compose.yml
@@ -54,7 +54,7 @@ services:
       - traefik.http.middlewares.group.plugin.sablier.dynamic.displayName=Group E2E
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     # Cannot use labels because as soon as the container is stopped, the labels are not treated by Traefik
     # The route doesn't exist anymore. Use dynamic-config.yml file instead.
     healthcheck:

diff --git a/plugins/traefik/e2e/docker_swarm/docker-stack.yml b/plugins/traefik/e2e/docker_swarm/docker-stack.yml
@@ -62,7 +62,7 @@ services:
         - traefik.http.services.sablier.loadbalancer.server.port=10000
 
   whoami:
-    image: containous/whoami:v1.5.0
+    image: acouvreur/whoami:v1.10.2
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost" ]
       interval: 5s

diff --git a/plugins/traefik/e2e/kubernetes/manifests/deployment.yml b/plugins/traefik/e2e/kubernetes/manifests/deployment.yml
@@ -18,13 +18,11 @@ spec:
     spec:
       containers:
       - name: whoami
-        image: containous/whoami:v1.5.0
+        image: acouvreur/whoami:v1.10.2
         livenessProbe:
-          exec:
-            command:
-              - curl
-              - -f
-              - http://localhost
+          httpGet:
+            path: /health
+            port: 80
           initialDelaySeconds: 5
           periodSeconds: 5
 ---