diff --git a/docker/Dockerfile b/docker/Dockerfile index 18c369193..ad713e891 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,9 +18,11 @@ RUN apt-get -qq update >/dev/null && apt-get install -qq \ # korean fonts-unfonts-core fonts-unfonts-extra \ # cjk + emoji font - fonts-noto-cjk fonts-noto-color-emoji \ - # chromium - chromium >/dev/null && apt-get -qq clean >/dev/null && rm -rf /var/lib/apt/lists/* + fonts-noto-cjk fonts-noto-color-emoji + +RUN apt-get install -qq chromium >/dev/null + +#RUN apt-get -qq clean >/dev/null && rm -rf /var/lib/apt/lists/* # skip download, we already have it installed ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true diff --git a/package.json b/package.json index 4d3917682..d47210c05 100644 --- a/package.json +++ b/package.json @@ -40,9 +40,9 @@ "build-docker": "PV=$(node -p -e \"require('./package.json').version\"); echo $PV; docker buildx build --platform linux/amd64,linux/arm64 -t backstopjs/backstopjs:$PV --build-arg BACKSTOPJS_VERSION=$PV docker; docker buildx build --platform linux/amd64,linux/arm64 -t backstopjs/backstopjs:latest --build-arg BACKSTOPJS_VERSION=$PV docker", "build-and-load-docker": "PV=$(node -p -e \"require('./package.json').version\"); echo $PV; docker buildx build --load -t backstopjs/backstopjs:$PV docker", "publish-docker": "PV=$(node -p -e \"require('./package.json').version\"); echo $PV; docker buildx build --push --platform linux/amd64,linux/arm64 -t backstopjs/backstopjs:$PV --build-arg BACKSTOPJS_VERSION=$PV docker; docker buildx build --push --platform linux/amd64,linux/arm64 -t backstopjs/backstopjs:latest --build-arg BACKSTOPJS_VERSION=$PV docker", - "build-and-publish": "npm run publish-npm && npm run build-docker && npm run publish-docker", - "init-docker-builder": "docker buildx create --name backstopbuilder --use --bootstrap", - "burn-docker-builder": "docker buildx rm backstopbuilder", + "build-and-publish": "npm run publish-npm && npm run publish-docker", + "init-docker-builder": "docker buildx create --name backstopjsbuilder --use --bootstrap", + "burn-docker-builder": "docker buildx rm backstopjsbuilder; docker builder prune --all", "success-message": "printf \"\\n\\e[32m✓ SUCCESS!\\e[0m BackstopJS internal testing passed.\\n\"", "caution-message": "printf \"\\n\\e[33m⚠ Notice.\\e[0m BackstopJS internal testing exited with a non-success status. This is expected when BackstopJS finds differences.\\n\"", "fail-message": "printf \"\\n\\e[31m✖ FAIL!\\e[0m BackstopJS internal testing failed. See logs for details.\\n\""