From 15afa6c11c6a1fc9c4a9ecf0c6ac7219e3173279 Mon Sep 17 00:00:00 2001 From: up9cloud <8325632+up9cloud@users.noreply.github.com> Date: Sun, 14 Jul 2024 01:54:43 +0000 Subject: [PATCH] --- .github/workflows/main.yml | 20 ++++++++++---------- README.md | 3 +++ debian-12/Dockerfile | 1 + ubuntu-20/Dockerfile | 4 ++-- ubuntu-22/Dockerfile | 4 ++-- Dockerfile => ubuntu-24/Dockerfile | 4 ++-- 6 files changed, 20 insertions(+), 16 deletions(-) rename Dockerfile => ubuntu-24/Dockerfile (81%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e3b8c4..6431764 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,32 +22,32 @@ jobs: with: push: true platforms: linux/amd64,linux/arm64 - file: ./Dockerfile - tags: ${{ steps.meta.outputs.tags }} + file: ./debian-11/Dockerfile + tags: sstc/headful-chromium:debian-11 - uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 - file: ./ubuntu-20/Dockerfile - tags: sstc/headful-chromium:ubuntu-20 + file: ./debian-12/Dockerfile + tags: sstc/headful-chromium:debian-12 - uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 - file: ./ubuntu-22/Dockerfile - tags: sstc/headful-chromium:ubuntu-22 + file: ./ubuntu-20/Dockerfile + tags: sstc/headful-chromium:ubuntu-20 - uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 - file: ./debian-11/Dockerfile - tags: sstc/headful-chromium:debian-11 + file: ./ubuntu-22/Dockerfile + tags: sstc/headful-chromium:ubuntu-22 - uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 - file: ./debian-12/Dockerfile - tags: sstc/headful-chromium:debian-12 + file: ./ubuntu-24/Dockerfile + tags: ${{ steps.meta.outputs.tags }} - uses: actions/checkout@v4 - uses: christian-korneck/update-container-description-action@v1 env: diff --git a/README.md b/README.md index bc0da22..a98989f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # docker-headful-chromium +[![Build workflow](https://github.com/docker-sstc/docker-headful-chromium/actions/workflows/main.yml/badge.svg)](https://github.com/docker-sstc/docker-headful-chromium/actions) +[![Docker pulls](https://img.shields.io/docker/pulls/sstc/headful-chromium.svg)](https://hub.docker.com/r/sstc/headful-chromium) + ## Usage ```bash diff --git a/debian-12/Dockerfile b/debian-12/Dockerfile index 7e22cb5..1821638 100644 --- a/debian-12/Dockerfile +++ b/debian-12/Dockerfile @@ -4,6 +4,7 @@ RUN set -ex; \ apt-get update; \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ # Install headful deps + chromium \ xvfb \ xauth \ ; \ diff --git a/ubuntu-20/Dockerfile b/ubuntu-20/Dockerfile index 6249892..f26f609 100644 --- a/ubuntu-20/Dockerfile +++ b/ubuntu-20/Dockerfile @@ -1,7 +1,7 @@ # https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal -# version: https://github.com/microsoft/playwright/releases +# playwright version: https://github.com/microsoft/playwright/releases # ubuntu version: https://releases.ubuntu.com/ -FROM mcr.microsoft.com/playwright:v1.45.0-focal +FROM mcr.microsoft.com/playwright:v1.45.1-focal # RUN set -ex; \ # apt-get update; \ diff --git a/ubuntu-22/Dockerfile b/ubuntu-22/Dockerfile index 1b2dcf5..4ca6c8b 100644 --- a/ubuntu-22/Dockerfile +++ b/ubuntu-22/Dockerfile @@ -1,7 +1,7 @@ # https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.jammy -# version: https://github.com/microsoft/playwright/releases +# playwright version: https://github.com/microsoft/playwright/releases # ubuntu version: https://releases.ubuntu.com/ -FROM mcr.microsoft.com/playwright:v1.45.0-jammy +FROM mcr.microsoft.com/playwright:v1.45.1-jammy # RUN set -ex; \ # apt-get update; \ diff --git a/Dockerfile b/ubuntu-24/Dockerfile similarity index 81% rename from Dockerfile rename to ubuntu-24/Dockerfile index 764a221..fb7295a 100644 --- a/Dockerfile +++ b/ubuntu-24/Dockerfile @@ -1,7 +1,7 @@ # https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.noble -# version: https://github.com/microsoft/playwright/releases +# playwright version: https://github.com/microsoft/playwright/releases # ubuntu version: https://releases.ubuntu.com/ -FROM mcr.microsoft.com/playwright:v1.45.0-noble +FROM mcr.microsoft.com/playwright:v1.45.1-noble # RUN set -ex; \ # apt-get update; \