diff --git a/docker/debian/10/Dockerfile b/docker/debian/10/Dockerfile index e5668f17..cd44bdf1 100644 --- a/docker/debian/10/Dockerfile +++ b/docker/debian/10/Dockerfile @@ -41,7 +41,7 @@ FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - task -d /build/task.d/deb install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl1.1 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl1.1 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup @@ -135,7 +135,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ #!/bin/bash -e apt-get -qq update -y - apt-get -qq install -y --no-install-recommends libsqlite3-dev libasound2-dev +apt-get -qq upgrade -y --no-install-recommends +apt-get -qq install -y --no-install-recommends libsqlite3-dev libasound2-dev EOF FROM rpi-debian AS rpi-debian-asterisk-dev diff --git a/docker/debian/11/Dockerfile b/docker/debian/11/Dockerfile index e314e8e6..5da36b79 100644 --- a/docker/debian/11/Dockerfile +++ b/docker/debian/11/Dockerfile @@ -41,7 +41,7 @@ FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - task -d /build/task.d/deb install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl1.1 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl1.1 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup @@ -142,7 +142,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ #!/bin/bash -e apt-get -qq update -y - apt-get -qq install -y --no-install-recommends asterisk-dev +apt-get -qq upgrade -y --no-install-recommends +apt-get -qq install -y --no-install-recommends asterisk-dev EOF FROM chan-quectel-base AS chan-quectel-rpi-base diff --git a/docker/debian/12/Dockerfile b/docker/debian/12/Dockerfile index a72c920f..6272652d 100644 --- a/docker/debian/12/Dockerfile +++ b/docker/debian/12/Dockerfile @@ -41,7 +41,7 @@ FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - task -d /build/task.d/deb install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl3 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file build-essential dpkg-dev ca-certificates jq libsqlite3-dev libssl3 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup @@ -114,6 +114,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ #!/bin/bash -e apt-get -qq update -y +apt-get -qq upgrade -y --no-install-recommends apt-get -qq install -y --no-install-recommends asterisk-dev EOF diff --git a/docker/rpi-debian/10/Dockerfile b/docker/rpi-debian/10/Dockerfile index eafd51f9..43fbf1c3 100644 --- a/docker/rpi-debian/10/Dockerfile +++ b/docker/rpi-debian/10/Dockerfile @@ -19,7 +19,7 @@ COPY --from=task deb /build/task.d/deb FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked -- \ - task -d /build/task.d/deb install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup diff --git a/docker/rpi-debian/11/Dockerfile b/docker/rpi-debian/11/Dockerfile index 1cea1258..d8b7f224 100644 --- a/docker/rpi-debian/11/Dockerfile +++ b/docker/rpi-debian/11/Dockerfile @@ -18,7 +18,7 @@ COPY --from=task deb /build/task.d/deb FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked -- \ - task -d /build/task.d/deb install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup diff --git a/docker/rpi-debian/12/Dockerfile b/docker/rpi-debian/12/Dockerfile index d5a9d088..b5b6127b 100644 --- a/docker/rpi-debian/12/Dockerfile +++ b/docker/rpi-debian/12/Dockerfile @@ -18,7 +18,7 @@ COPY --from=task deb /build/task.d/deb FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked -- \ - task -d /build/task.d/deb install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl3 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file ca-certificates jq dpkg-dev libsqlite3-dev libssl3 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup diff --git a/docker/task.d/deb/Taskfile.dist.yaml b/docker/task.d/deb/Taskfile.dist.yaml index 9e26e436..937e5a6e 100644 --- a/docker/task.d/deb/Taskfile.dist.yaml +++ b/docker/task.d/deb/Taskfile.dist.yaml @@ -19,6 +19,16 @@ tasks: silent: true - apt-get -qq install -y --no-install-recommends {{.CLI_ARGS}} + upgrade-and-install-pkgs: + desc: Install specified packages (DEB) + env: + DEBIAN_FRONTEND: noninteractive + cmds: + - cmd: apt-get -qq update -y + silent: true + - apt-get -qq upgrade -y --no-install-recommends + - apt-get -qq install -y --no-install-recommends {{.CLI_ARGS}} + install-pkgs-arch: desc: Adds architecture and install specified packages preconditions: diff --git a/docker/ubuntu/20.04/Dockerfile b/docker/ubuntu/20.04/Dockerfile index 81c279c1..a4a23581 100644 --- a/docker/ubuntu/20.04/Dockerfile +++ b/docker/ubuntu/20.04/Dockerfile @@ -38,7 +38,7 @@ RUN --network=none --mount=type=bind,from=dl-arm-gnu-toolchain,target=/build/dow FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked -- \ - task -d /build/task.d/deb install-pkgs -- file build-essential ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file build-essential ca-certificates jq dpkg-dev libsqlite3-dev libssl1.1 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup diff --git a/docker/ubuntu/22.04/Dockerfile b/docker/ubuntu/22.04/Dockerfile index 14a9967c..09de689f 100644 --- a/docker/ubuntu/22.04/Dockerfile +++ b/docker/ubuntu/22.04/Dockerfile @@ -28,7 +28,7 @@ ARG ARM_GNU_TOOLCHAIN_VER RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - task -d /build/task.d/deb install-pkgs -- xz-utils + task -d /build/task.d/deb upgrade-and-install-pkgs -- xz-utils COPY --from=task arm-gnu-toolchain /build/task.d/arm-gnu-toolchain RUN --network=none task -d /build/task.d/arm-gnu-toolchain create-directory diff --git a/docker/ubuntu/24.04/Dockerfile b/docker/ubuntu/24.04/Dockerfile index 32654256..f07a3fe5 100644 --- a/docker/ubuntu/24.04/Dockerfile +++ b/docker/ubuntu/24.04/Dockerfile @@ -38,7 +38,7 @@ RUN --network=none --mount=type=bind,from=dl-arm-gnu-toolchain,target=/build/dow FROM task-base AS base RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ - task -d /build/task.d/deb install-pkgs -- file build-essential ca-certificates jq dpkg-dev libsqlite3-dev libssl3 + task -d /build/task.d/deb upgrade-and-install-pkgs -- file build-essential ca-certificates jq dpkg-dev libsqlite3-dev libssl3 RUN --network=none task -d /build create-build-directory && \ task -d /build/task.d/deb create-dotenv && \ task -d /build chown-build-directory -- nobody:nogroup