From 84d3f7ba3e6d838e1422683c8c4b603e4b99e952 Mon Sep 17 00:00:00 2001
From: Automation Pipeline <automated@simcop2387.info>
Date: Wed, 11 Oct 2023 11:37:20 -0400
Subject: [PATCH] Build only 5.20, use a different variable for suffix and also
 timestamp the os base containers

---
 .woodpecker/.build-perls.yml | 2 +-
 build.pl                     | 2 +-
 generate.pl                  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.woodpecker/.build-perls.yml b/.woodpecker/.build-perls.yml
index ab80332..b7a08b8 100644
--- a/.woodpecker/.build-perls.yml
+++ b/.woodpecker/.build-perls.yml
@@ -11,7 +11,7 @@ steps:
       - tar -xvJf output.tar.xz
       - cpanm --installdeps .
       - docker login -u simcop2387 -p $GITEA_DOCKER_TOKEN gitea.simcop2387.info
-      - perl build.pl --suffix ${CI_PIPELINE_STARTED}
+      - perl build.pl --suffix $CI_PIPELINE_CREATED --filter_tags=5.20 --build_args OS_TAG=$CI_PIPELINE_CREATED
     secrets: [gitea_docker_token]
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/build.pl b/build.pl
index 46deb7f..63f22fe 100755
--- a/build.pl
+++ b/build.pl
@@ -122,7 +122,7 @@ sub run_cmd {
 
    try {
 
-   print "Running command $disp_prefix ".$cmd->[0], "\n";
+   print "Running command $disp_prefix: ".join(' ', @$cmd), "\n";
 
    return if $skip_build;
 
diff --git a/generate.pl b/generate.pl
index 2cc451f..a64c204 100755
--- a/generate.pl
+++ b/generate.pl
@@ -40,7 +40,8 @@ EOF
 my $config = YAML::XS::Load path("config.yml")->slurp_utf8();
 
 my $template = <<~'EOF';
-FROM {{build_image}}:{{tag}}
+ARG OS_TAG=""
+FROM {{build_image}}:{{tag}}$OS_TAG
 LABEL maintainer="Ryan Voots <simcop@cpan.org>"
 
 COPY *.patch /usr/src/perl/