diff --git a/.docker/workspace/Dockerfile b/.docker/workspace/Dockerfile index 422c0fc..a4783fb 100644 --- a/.docker/workspace/Dockerfile +++ b/.docker/workspace/Dockerfile @@ -620,9 +620,9 @@ RUN if [ ${INSTALL_WKHTMLTOPDF} = true ]; then \ xfonts-base \ xfonts-75dpi \ wget \ - && wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.focal_${ARCH}.deb" \ + && (wget "https://github.com/wkhtmltopdf/packaging/releases/download/${WKHTMLTOPDF_VERSION}/wkhtmltox_${WKHTMLTOPDF_VERSION}.focal_${ARCH}.deb" \ && dpkg -i "wkhtmltox_${WKHTMLTOPDF_VERSION}.focal_${ARCH}.deb" \ - && apt -f install \ + && apt -f install) || echo "wkhtmltopdf installation failed, continuing..." \ ;fi ########################################################################### diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index 2135695..7e69b9b 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -24,6 +24,7 @@ jobs: cp .env.example .env.docker sed -i "s/PHP_VERSION=8.1/PHP_VERSION=${{ matrix.php-version }}/" .env.docker sed -i "s/WORKSPACE_INSTALL_PYTHON3=true/WORKSPACE_INSTALL_PYTHON3=false/" .env.docker + sed -i "s/WORKSPACE_INSTALL_WKHTMLTOPDF=true/WORKSPACE_INSTALL_WKHTMLTOPDF=false/" .env.docker - name: Build workspace container run: | diff --git a/.github/workflows/test-containers.yml b/.github/workflows/test-containers.yml index d39e9c6..e637f61 100644 --- a/.github/workflows/test-containers.yml +++ b/.github/workflows/test-containers.yml @@ -42,6 +42,7 @@ jobs: cp .env.example .env.docker sed -i "s/PHP_VERSION=8.1/PHP_VERSION=${{ matrix.php-version }}/" .env.docker sed -i "s/WORKSPACE_INSTALL_PYTHON3=true/WORKSPACE_INSTALL_PYTHON3=false/" .env.docker + sed -i "s/WORKSPACE_INSTALL_WKHTMLTOPDF=true/WORKSPACE_INSTALL_WKHTMLTOPDF=false/" .env.docker - name: Build workspace container run: docker compose --env-file .env.docker build workspace