From 12e1ab0b07c1f515baa4598cb6a5b5d4ec82ee36 Mon Sep 17 00:00:00 2001 From: Ryan Voots Date: Fri, 29 Sep 2023 10:07:02 -0400 Subject: [PATCH] Fix syntax and also set build arg --- .woodpecker/.base-os.yml | 2 ++ os-base/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.base-os.yml b/.woodpecker/.base-os.yml index 9a2af3b..d247bf9 100644 --- a/.woodpecker/.base-os.yml +++ b/.woodpecker/.base-os.yml @@ -20,6 +20,8 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: repo: gitea.simcop2387.info/simcop2387/perl-os-base + build_args: + VERSION: ${DEBIAN_VERSION} dockerfile: os-base/Dockerfile auto_tag: false tags: diff --git a/os-base/Dockerfile b/os-base/Dockerfile index fc82ceb..d81dd73 100644 --- a/os-base/Dockerfile +++ b/os-base/Dockerfile @@ -1,5 +1,5 @@ ARG VERSION -FROM debian:$VERSION-backports +FROM debian:$VERSION LABEL maintainer="Ryan Voots " ENV DEBIAN_FRONTEND=noninteractive @@ -27,7 +27,7 @@ RUN perl -i.bak -pE '$x=$_; $x=~s|^deb |deb-src |g;$_.=$x' /etc/apt/sources.list patch \ procps \ zlib1g-dev \ - xz-utils + xz-utils \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ && rm -fr /var/cache/apt/* /var/lib/apt/lists/*