diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-autobuild.yml index 71b57b5a..656cd057 100644 --- a/.github/workflows/docker-autobuild.yml +++ b/.github/workflows/docker-autobuild.yml @@ -4,8 +4,8 @@ on: schedule: - cron: "0 0 */7 * *" push: - paths: - - 'docker/' + paths: + - 'docker/**' permissions: contents: read diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 8278b3fd..5c199bb1 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,4 +1,7 @@ FROM alpine:latest + RUN apk update && \ - apk add clang gcc git cmake make gtest-dev gtest-src re2 re2-dev fmt fmt-dev nodejs grep + apk add --no-cache python3 py3-pip clang gcc git cmake make \ + ninja nodejs grep \ + && pip3 install --no-cache-dir --break-system-packages conan \ No newline at end of file diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index ccd8d5f6..f37d3980 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -1,3 +1,7 @@ FROM archlinux:latest -RUN pacman -Syu cmake git clang gcc gtest re2 fmt base-devel nodejs --noconfirm +RUN pacman -Syu --noconfirm --needed \ + python python-pip cmake git clang gcc \ + base-devel nodejs \ + && pip install --no-cache-dir --break-system-packages conan \ + && pacman -Scc --noconfirm \ No newline at end of file diff --git a/docker/debian-stable/Dockerfile b/docker/debian-stable/Dockerfile index d48af887..c4549a6d 100644 --- a/docker/debian-stable/Dockerfile +++ b/docker/debian-stable/Dockerfile @@ -1,4 +1,6 @@ -FROM debian +FROM debian:latest -RUN apt update && \ - apt install git cmake clang libre2-9 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt-get update && apt-get install -y --no-install-recommends \ + git cmake clang libre2-9 libre2-dev gnu-which nodejs python3 python3-pip \ + && pip3 install --no-cache-dir --break-system-packages conan \ + && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/docker/debian-unstable/Dockerfile b/docker/debian-unstable/Dockerfile index 2720484f..d3bd113a 100644 --- a/docker/debian-unstable/Dockerfile +++ b/docker/debian-unstable/Dockerfile @@ -1,4 +1,6 @@ FROM debian:unstable -RUN apt update && \ - apt install git cmake clang libre2-11 libre2-dev libfmt10 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt-get update && apt-get install -y --no-install-recommends \ + git cmake clang libre2-9 libre2-dev gnu-which nodejs python3 python3-pip \ + && pip3 install --no-cache-dir --break-system-packages conan \ + && rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/docker/fedora/Dockerfile b/docker/fedora/Dockerfile index 2f133747..697cc95a 100644 --- a/docker/fedora/Dockerfile +++ b/docker/fedora/Dockerfile @@ -1,5 +1,8 @@ -FROM fedora - -RUN dnf update -y && \ - dnf install clang clang-libs gcc gtest gtest-devel fmt fmt-devel re2 re2-devel gtest gtest-devel git cmake libasan which nodejs -y +FROM fedora:latest +RUN dnf update -y \ + && dnf install -y --setopt=install_weak_deps=False git cmake \ + clang gcc which nodejs python3 python3-pip \ + && pip3 install --no-cache-dir --break-system-packages conan \ + && dnf clean all \ + && rm -rf /var/cache/dnf \ No newline at end of file diff --git a/docker/gentoo-glibc/Dockerfile b/docker/gentoo-glibc/Dockerfile index bead05b4..4c0d9e2f 100644 --- a/docker/gentoo-glibc/Dockerfile +++ b/docker/gentoo-glibc/Dockerfile @@ -2,4 +2,5 @@ FROM gentoo/stage3:systemd RUN emerge --sync > /dev/null && \ getuto && \ - emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs --getbinpkg -j2 + emerge llvm-core/clang cmake dev-vcs/git re2 libfmt gtest which nodejs conan --getbinpkg -j2 && + rm -rf /var/lib/repos/gentoo diff --git a/docker/gentoo-glibc/Dockerfile.save b/docker/gentoo-glibc/Dockerfile.save deleted file mode 100644 index a8034b04..00000000 --- a/docker/gentoo-glibc/Dockerfile.save +++ /dev/null @@ -1,5 +0,0 @@ -FROM gentoo/stage3:systemd - -RUN emerge --sync -RUN getuto -RUN emerge llvm-core/clang cmake gtest re2 libfmt dev-vcs/git --getbinpkg diff --git a/docker/gentoo-musl/stage1/Dockerfile b/docker/gentoo-musl/stage1/Dockerfile index f552c572..15412712 100644 --- a/docker/gentoo-musl/stage1/Dockerfile +++ b/docker/gentoo-musl/stage1/Dockerfile @@ -3,4 +3,4 @@ FROM gentoo/stage3:musl RUN emerge --sync > /dev/null && \ getuto && \ sed -i 's/^MAKEOPTS=".*"/MAKEOPTS="& -j8"/' /etc/portage/make.conf && \ - emerge llvm-core/llvm cmake gtest re2 libfmt dev-vcs/git --getbinpkg + emerge llvm-core/llvm cmake gtest re2 libfmt dev-vcs/git conan --getbinpkg diff --git a/docker/gentoo-musl/stage2/Dockerfile b/docker/gentoo-musl/stage2/Dockerfile index fbb23d7a..15b46378 100644 --- a/docker/gentoo-musl/stage2/Dockerfile +++ b/docker/gentoo-musl/stage2/Dockerfile @@ -1,3 +1,4 @@ FROM hyperwin/hcpu-ci:gentoo-musl-build -RUN emerge llvm-core/clang --getbinpkg +RUN emerge llvm-core/clang --getbinpkg && \ + rm -rf /var/lib/repos/gentoo diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 62ba3169..6c7c07d6 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -1,4 +1,6 @@ FROM ubuntu:latest -RUN apt update && \ - apt install git cmake clang libre2-10 libre2-dev libfmt9 libfmt-dev libgtest-dev googletest gnu-which nodejs -y +RUN apt update && apt install -y --no-install-recommends \ + git cmake clang libre2-9 libre2-dev gnu-which nodejs python3 python3-pip \ + && pip3 install --no-cache-dir --break-system-packages conan \ + && rm -rf /var/lib/apt/lists/* \ No newline at end of file