gplugin/builders

Update all the things

11 months ago, Gary Kramlich
201f13a9886f
Parents dc80176bc250
Children 4fb24799acee
Update all the things
17 files changed, 102 insertions(+), 115 deletions(-)
  • +2 -2
    Dockerfile.alpine-edge-amd64
  • +4 -4
    Dockerfile.clang-format
  • +8 -10
    Dockerfile.debian-bookworm-amd64
  • +8 -10
    Dockerfile.debian-bookworm-arm64
  • +8 -8
    Dockerfile.debian-bookworm-armhf
  • +1 -1
    Dockerfile.dist
  • +0 -20
    Dockerfile.fedora-36-amd64
  • +19 -0
    Dockerfile.fedora-38-amd64
  • +3 -4
    Dockerfile.fedora-rawhide-amd64
  • +1 -1
    Dockerfile.i18n
  • +4 -7
    Dockerfile.opensuse-tumbleweed-amd64
  • +4 -4
    Dockerfile.scanbuild
  • +0 -4
    Dockerfile.simple
  • +0 -34
    Dockerfile.ubuntu-jammy-amd64
  • +34 -0
    Dockerfile.ubuntu-lunar-amd64
  • +1 -1
    Dockerfile.valgrind
  • +5 -5
    convey.yml
    • --- a/Dockerfile.alpine-edge-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.alpine-edge-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -1,9 +1,9 @@
    -FROM alpine:edge
    +FROM docker.io/alpine:edge
    RUN set -ex && \
    apk add --no-cache \
    mercurial git ca-certificates \
    - meson ninja gcc libc-dev help2man libxslt \
    + meson ninja gcc libc-dev help2man \
    gobject-introspection-dev gobject-introspection-dev \
    gtk4.0-dev libadwaita-dev \
    python3 python3-dev py-gobject3-dev py3-gobject3 \
    --- a/Dockerfile.clang-format Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.clang-format Thu Jun 01 00:58:37 2023 -0500
    @@ -1,9 +1,9 @@
    -FROM gplugin/builders:debian-bookworm-amd64
    +FROM docker.io/gplugin/builders:debian-bookworm-amd64
    RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends clang-format && \
    - apt-get clean && \
    + apt update && \
    + apt install -y --no-install-recommends clang-format && \
    + apt clean && \
    rm -rf /var/lib/apt/lists
    COPY clang-format/build.sh /
    --- a/Dockerfile.debian-bookworm-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.debian-bookworm-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -1,26 +1,24 @@
    -FROM debian:bookworm
    +FROM docker.io/debian:bookworm
    +
    +ENV TARGET=debian-bookworm-amd64
    RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial git \
    + apt update && \
    + apt install -y --no-install-recommends \
    + ca-certificates unzip \
    + build-essential meson gettext help2man mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    libgtk-4-dev libadwaita-1-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-packaging python3-pygments python3-toml \
    python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    - libtcc-dev \
    valac \
    - libgjs-dev \
    && \
    - apt-get clean && \
    + apt clean && \
    rm -rf /var/lib/apt/lists
    CMD ["/build.sh"]
    -ENV TARGET=debian-bookworm-amd64
    -
    COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-arm64 Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.debian-bookworm-arm64 Thu Jun 01 00:58:37 2023 -0500
    @@ -1,26 +1,24 @@
    -FROM arm64v8/debian:bookworm
    +FROM docker.io/arm64v8/debian:bookworm
    +
    +ENV TARGET=debian-bookworm-arm64
    RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial git \
    + apt update && \
    + apt install -y --no-install-recommends \
    + ca-certificates unzip \
    + build-essential meson gettext help2man mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    libgtk-4-dev \
    python3-dev python-gi-dev python3-gi \
    python3-jinja2 python3-packaging python3-pygments python3-toml \
    python3-typogrify \
    liblua5.3-dev lua-lgi luarocks \
    - libtcc-dev \
    valac \
    - libgjs-dev \
    && \
    - apt-get clean && \
    + apt clean && \
    rm -rf /var/lib/apt/lists
    CMD ["/build.sh"]
    -ENV TARGET=debian-bookworm-arm64
    -
    COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-armhf Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.debian-bookworm-armhf Thu Jun 01 00:58:37 2023 -0500
    @@ -1,10 +1,12 @@
    -FROM arm32v7/debian:bookworm
    +FROM docker.io/arm32v7/debian:bookworm
    +
    +ENV TARGET=debian-bookworm-armhf
    RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial git \
    + apt update && \
    + apt install -y --no-install-recommends \
    + ca-certificates unzip \
    + build-essential meson gettext help2man mercurial git \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    libgtk-4-dev \
    python3-dev python-gi-dev python3-gi \
    @@ -13,12 +15,10 @@
    liblua5.3-dev lua-lgi luarocks \
    valac \
    && \
    - apt-get clean && \
    + apt clean && \
    rm -rf /var/lib/apt/lists
    CMD ["/build.sh"]
    -ENV TARGET=debian-bookworm-armhf
    -
    COPY meson/build.sh /build.sh
    --- a/Dockerfile.dist Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.dist Thu Jun 01 00:58:37 2023 -0500
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:debian-bookworm-amd64
    +FROM docker.io/gplugin/builders:debian-bookworm-amd64
    COPY dist/build.sh /
    --- a/Dockerfile.fedora-36-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,20 +0,0 @@
    -FROM fedora:36
    -
    -RUN set -ex && \
    - dnf update -y && \
    - dnf install -y \
    - meson ninja-build gcc mercurial git \
    - redhat-rpm-config rpm-build \
    - help2man libxslt gettext \
    - glib2-devel gobject-introspection-devel \
    - gtk4-devel \
    - lua-devel lua-lgi lua-lpeg \
    - python3-devel pygobject3-devel python3-gobject \
    - python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    - vala
    -
    -CMD ["/build.sh"]
    -
    -ENV TARGET=fedora-36-amd64
    -
    -COPY meson/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.fedora-38-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -0,0 +1,19 @@
    +FROM docker.io/fedora:38
    +
    +ENV TARGET=fedora-38-amd64
    +
    +RUN set -ex && \
    + dnf update -y && \
    + dnf install -y \
    + meson ninja-build gcc mercurial git \
    + help2man libxslt gettext \
    + glib2-devel gobject-introspection-devel \
    + gtk4-devel \
    + lua-devel lua-lgi lua-lpeg \
    + python3-devel pygobject3-devel python3-gobject \
    + python3-jinja2 python3-pygments python3-markdown python3-toml python3-typogrify \
    + vala
    +
    +CMD ["/build.sh"]
    +
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.fedora-rawhide-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.fedora-rawhide-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -1,10 +1,11 @@
    -FROM fedora:rawhide
    +FROM docker.io/fedora:rawhide
    +
    +ENV TARGET=fedora-rawhide-amd64
    RUN set -ex && \
    dnf update -y && \
    dnf install -y \
    meson ninja-build gcc mercurial git \
    - redhat-rpm-config rpm-build \
    help2man libxslt gettext \
    glib2-devel gobject-introspection-devel \
    gtk4-devel \
    @@ -15,6 +16,4 @@
    CMD ["/build.sh"]
    -ENV TARGET=fedora-rawhide-amd64
    -
    COPY meson/build.sh /build.sh
    --- a/Dockerfile.i18n Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.i18n Thu Jun 01 00:58:37 2023 -0500
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:debian-bookworm-amd64
    +FROM docker.io/gplugin/builders:debian-bookworm-amd64
    COPY i18n/build.sh /
    --- a/Dockerfile.opensuse-tumbleweed-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.opensuse-tumbleweed-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -1,12 +1,13 @@
    -FROM opensuse/tumbleweed:latest
    +FROM docker.io/opensuse/tumbleweed:latest
    +
    +ENV TARGET=opensuse-tumbleweed-amd64
    RUN set -ex && \
    zypper --gpg-auto-import-keys refresh && \
    zypper install -y \
    ca-certificates-mozilla \
    meson ninja gcc mercurial git pkgconfig \
    - rpm-build \
    - help2man libxslt-tools gettext-tools \
    + help2man gettext-tools \
    glib2-devel gobject-introspection-devel \
    gtk4-devel \
    python3-devel python3-gobject python3-gobject-devel \
    @@ -19,9 +20,5 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=opensuse \
    - VERSION=tumbleweed \
    - ARCH=amd64
    -
    COPY meson/build.sh /build.sh
    --- a/Dockerfile.scanbuild Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.scanbuild Thu Jun 01 00:58:37 2023 -0500
    @@ -1,9 +1,9 @@
    -FROM gplugin/builders:debian-bookworm-amd64
    +FROM docker.io/gplugin/builders:debian-bookworm-amd64
    RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends clang-tools && \
    - apt-get clean && \
    + apt update && \
    + apt install -y --no-install-recommends clang-tools && \
    + apt clean && \
    rm -rf /var/lib/apt/lists
    COPY scanbuild/build.sh /
    --- a/Dockerfile.simple Tue Feb 21 22:00:48 2023 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,4 +0,0 @@
    -FROM gplugin/builders:debian-bookworm-amd64
    -
    -COPY meson/build.sh /
    -
    --- a/Dockerfile.ubuntu-jammy-amd64 Tue Feb 21 22:00:48 2023 -0600
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,34 +0,0 @@
    -FROM ubuntu:jammy
    -
    -COPY ubuntu/tzdata.selections /
    -
    -RUN set -ex && \
    - debconf-set-selections -v /tzdata.selections && \
    - ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends tzdata && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -RUN set -ex && \
    - apt-get update && \
    - apt-get install -y --no-install-recommends \
    - ca-certificates unzip devscripts fakeroot debhelper libdistro-info-perl \
    - build-essential meson gettext help2man xsltproc mercurial git \
    - libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    - libgtk-4-dev \
    - python3-dev python-gi-dev python3-gi \
    - python3-jinja2 python3-packaging python3-pygments python3-toml \
    - python3-typogrify \
    - liblua5.3-dev lua-lgi luarocks \
    - valac \
    - && \
    - apt-get clean && \
    - rm -rf /var/lib/apt/lists
    -
    -CMD ["/build.sh"]
    -
    -ENV TARGET=ubuntu-hirsute-amd64
    -
    -COPY meson/build.sh /build.sh
    -
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.ubuntu-lunar-amd64 Thu Jun 01 00:58:37 2023 -0500
    @@ -0,0 +1,34 @@
    +FROM docker.io/ubuntu:lunar
    +
    +ENV TARGET=ubuntu-lunar-amd64
    +
    +COPY ubuntu/tzdata.selections /
    +
    +RUN set -ex && \
    + debconf-set-selections -v /tzdata.selections && \
    + ln -nsf /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
    + apt update && \
    + apt install -y --no-install-recommends tzdata && \
    + apt clean && \
    + rm -rf /var/lib/apt/lists
    +
    +RUN set -ex && \
    + apt update && \
    + apt install -y --no-install-recommends \
    + ca-certificates unzip \
    + build-essential meson gettext help2man mercurial git \
    + libglib2.0-dev gobject-introspection libgirepository1.0-dev \
    + libgtk-4-dev \
    + python3-dev python-gi-dev python3-gi \
    + python3-jinja2 python3-packaging python3-pygments python3-toml \
    + python3-typogrify \
    + liblua5.3-dev lua-lgi luarocks \
    + valac \
    + && \
    + apt clean && \
    + rm -rf /var/lib/apt/lists
    +
    +CMD ["/build.sh"]
    +
    +COPY meson/build.sh /build.sh
    +
    --- a/Dockerfile.valgrind Tue Feb 21 22:00:48 2023 -0600
    +++ b/Dockerfile.valgrind Thu Jun 01 00:58:37 2023 -0500
    @@ -1,4 +1,4 @@
    -FROM gplugin/builders:fedora-36-amd64
    +FROM gplugin/builders:fedora-38-amd64
    RUN set -ex && \
    dnf update -y && \
    --- a/convey.yml Tue Feb 21 22:00:48 2023 -0600
    +++ b/convey.yml Thu Jun 01 00:58:37 2023 -0500
    @@ -85,8 +85,8 @@
    stages:
    - tasks: [import, build]
    - fedora-36-amd64:
    - environment: [TARGET=fedora-36-amd64]
    + fedora-38-amd64:
    + environment: [TARGET=fedora-38-amd64]
    stages:
    - tasks: [import, build]
    @@ -110,8 +110,8 @@
    stages:
    - tasks: [import, build]
    - ubuntu-jammy-amd64:
    - environment: [TARGET=ubuntu-jammy-amd64]
    + ubuntu-lunar-amd64:
    + environment: [TARGET=ubuntu-lunar-amd64]
    stages:
    - tasks: [import, build]
    @@ -127,7 +127,7 @@
    - clang-format
    - debian-bookworm-amd64
    - dist
    - - fedora-36-amd64
    + - fedora-38-amd64
    - fedora-rawhide-amd64
    - i18n
    - opensuse-tumbleweed-amd64