From 31764b69dce82f428f4e1e5058dc76ad715c7998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Tue, 12 May 2026 23:38:54 +0200 Subject: [PATCH 1/3] fix: Try to get original command dynamically --- .github/workflows/e2e-test.yml | 1 + tests/e2e/docker/docker-compose.plugins.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index d210d49..c2e7061 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -370,6 +370,7 @@ jobs: - name: Start docker containers run: | + export ORIGINAL_CMD=$(docker inspect --format='{{join .Config.Cmd " "}}' etherpad/etherpad:${{ matrix.versions.tag }}) EP_VERSION=${{ matrix.versions.tag }} docker compose -f ./tests/e2e/docker/docker-compose.plugins.yml up -d --wait - name: Dump docker compose logs on failure diff --git a/tests/e2e/docker/docker-compose.plugins.yml b/tests/e2e/docker/docker-compose.plugins.yml index 6242194..2fa4822 100644 --- a/tests/e2e/docker/docker-compose.plugins.yml +++ b/tests/e2e/docker/docker-compose.plugins.yml @@ -1,6 +1,6 @@ services: etherpad: image: etherpad/etherpad:$EP_VERSION - command: ["sh", "-c", "pnpm run plugins i ep_align ep_headings2 ep_font_color ep_adminpads2 ep_comments_page ep_font_size ep_markdown && pnpm run prod"] + entrypoint: /bin/sh -c "pnpm run plugins i ep_align ep_headings2 ep_font_color ep_adminpads2 ep_comments_page ep_font_size ep_markdown && ${ORIGINAL_CMD}" ports: - 9001:9001 From 04f248b97bb4ca03bbfcd9e966f3be0788728c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Tue, 12 May 2026 23:40:20 +0200 Subject: [PATCH 2/3] Add debug output --- .github/workflows/e2e-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index c2e7061..a270297 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -371,6 +371,7 @@ jobs: - name: Start docker containers run: | export ORIGINAL_CMD=$(docker inspect --format='{{join .Config.Cmd " "}}' etherpad/etherpad:${{ matrix.versions.tag }}) + echo "Original CMD: $ORIGINAL_CMD" EP_VERSION=${{ matrix.versions.tag }} docker compose -f ./tests/e2e/docker/docker-compose.plugins.yml up -d --wait - name: Dump docker compose logs on failure From a081a265947ba7cd7d2410e257d5f9fb58c73d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20M=C3=BCller?= Date: Tue, 12 May 2026 23:43:13 +0200 Subject: [PATCH 3/3] pull docker image before docker inspect --- .github/workflows/e2e-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index a270297..d3e3903 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -370,6 +370,7 @@ jobs: - name: Start docker containers run: | + docker pull etherpad/etherpad:${{ matrix.versions.tag }} export ORIGINAL_CMD=$(docker inspect --format='{{join .Config.Cmd " "}}' etherpad/etherpad:${{ matrix.versions.tag }}) echo "Original CMD: $ORIGINAL_CMD" EP_VERSION=${{ matrix.versions.tag }} docker compose -f ./tests/e2e/docker/docker-compose.plugins.yml up -d --wait