devops: fix Docker canary publishing/building (microsoft#2168)

mxschmitt · web-flow · commit f5f145f1e216 · 2023-11-16T18:33:44.000+01:00
diff --git a/utils/docker/Dockerfile.jammy b/utils/docker/Dockerfile.jammy
@@ -43,6 +43,7 @@ RUN mkdir /ms-playwright && \
     # if its arm64 then install the manylinux1_aarch64 pip package
     if [ "$(uname -m)" = "aarch64" ]; then pip install /tmp/*manylinux_2_17_aarch64*.whl; fi && \
     playwright mark-docker-image "${DOCKER_IMAGE_NAME_TEMPLATE}" && \
+    playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \
     # Workaround for https://github.com/microsoft/playwright/issues/27313
     # While the gstreamer plugin load process can be in-process, it ended up throwing
     # an error that it can't have libsoup2 and libsoup3 in the same process because
@@ -52,7 +53,6 @@ RUN mkdir /ms-playwright && \
     else \
         rm /usr/lib/x86_64-linux-gnu/gstreamer-1.0/libgstwebrtc.so; \
     fi && \
-    playwright install --with-deps && rm -rf /var/lib/apt/lists/* && \
     rm /tmp/*.whl && \
     rm -rf /ms-playwright-agent && \
     chmod -R 777 /ms-playwright
diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh
@@ -16,7 +16,7 @@ if [[ "${RELEASE_CHANNEL}" == "stable" ]]; then
     exit 1
   fi
 elif [[ "${RELEASE_CHANNEL}" == "canary" ]]; then
-  if [[ "${PW_VERSION}" != *post* ]]; then
+  if [[ "${PW_VERSION}" != *dev* ]]; then
     echo "ERROR: cannot publish canary docker with Playwright version '${PW_VERSION}'"
     exit 1
   fi
