Extract all base container dependencies for multi-stage builds (OBS-68)

Author: dirkmueller

Build/Docker.pm

@@ -169,14 +169,18 @@ sub cmd_apt_get {
 sub parse {
   my ($cf, $fn) = @_;
 
-  my $basecontainer;
   my $unorderedrepos;
   my $useobsrepositories;
   my $nosquash;
-  my $dockerfile_data = slurp($fn);
-  return { 'error' => 'could not open Dockerfile' } unless defined $dockerfile_data;
-
+  my $dockerfile_data;
+  if (ref($fn) eq 'SCALAR') {
+    $dockerfile_data = $$fn;
+  } else {
+    $dockerfile_data = slurp($fn);
+    return { 'error' => 'could not open Dockerfile' } unless defined $dockerfile_data;
+  }
   my @lines = split(/\r?\n/, $dockerfile_data);
+
   my $ret = {
     'deps' => [],
     'path' => [],
@@ -261,9 +265,15 @@ sub parse {
     # process commands
     if ($cmd eq 'FROM') {
       shift @args if @args && $args[0] =~ /^--platform=/;
-      if (@args && !$basecontainer && $args[0] ne 'scratch') {
-        $basecontainer = $args[0];
-        $basecontainer .= ':latest' unless $basecontainer =~ /:[^:\/]+$/;
+      if (@args) {
+        my $container = $args[0];
+        if ($container ne 'scratch') {
+          $container .= ':latest' unless $container =~ /:[^:\/]+$/;
+          $container = "container:$container";
+          if ($container && !grep {$_ eq $container} @{$ret->{'deps'}}) {
+            push @{$ret->{'deps'}}, $container;
+          }
+        }
       }
       $vars_env = {};		# should take env from base container
       $vars = { %$vars_env };
@@ -301,7 +311,6 @@ sub parse {
       }
     }
   }
-  push @{$ret->{'deps'}}, "container:$basecontainer" if $basecontainer;
   push @{$ret->{'deps'}}, '--unorderedimagerepos' if $unorderedrepos;
   my $version = $ret->{'version'};
   my $release = $cf->{'buildrelease'};
@@ -311,7 +320,6 @@ sub parse {
   }
   $ret->{'name'} = 'docker' if !defined($ret->{'name'}) && !$cf->{'__dockernoname'};
   $ret->{'path'} = [ { 'project' => '_obsrepositories', 'repository' => '' } ] if $useobsrepositories;
-  $ret->{'basecontainer'} = $basecontainer if $basecontainer;
   $ret->{'nosquash'} = 1 if $nosquash;
   return $ret;
 }

help

@@ -1,11 +1,15 @@
-FROM opensuse:latest
+FROM opensuse/tumbleweed AS tw
 
+# debug
+RUN cat /etc/os-release
+
+FROM opensuse/leap:15.2
 # Make obs_pkg_mgr available
 ARG OBS_REPOSITORY_URL
 ADD obs_pkg_mgr /usr/bin/obs_pkg_mgr
 RUN chmod +x /usr/bin/obs_pkg_mgr
 
-RUN obs_pkg_mgr add_repo http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_42.2/ "Virtualization:Containers (openSUSE_Leap_42.2)" && ls ; obs_pkg_mgr add_repo http://example.com/my_project:/mysubproject/my_package/ "My example project" && ls
+RUN obs_pkg_mgr add_repo http://download.opensuse.org/repositories/Virtualization:/containers/openSUSE_Leap_15.2/ "Virtualization:Containers (openSUSE_Leap_15.2)" && ls ; obs_pkg_mgr add_repo http://example.com/my_project:/mysubproject/my_package/ "My example project" && ls
 
 RUN obs_pkg_mgr install util-linux calcurse # amarok
 RUN obs_pkg_mgr install awk gcc \

obs_example/Dockerfile

@@ -0,0 +1,32 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Test::More tests => 1;
+
+use Build;
+use Build::Docker;
+
+my ($dockerfile);
+my $result;
+my $expected;
+
+my $conf = Build::read_config('x86_64');
+
+$dockerfile = q{
+FROM opensuse/tumbleweed AS tw
+
+# debug
+RUN cat /etc/os-release
+
+FROM opensuse/leap:15.2
+};
+
+$expected = {
+  'path' => [],
+  'deps' => ['container:opensuse/tumbleweed:latest', 'container:opensuse/leap:15.2'],
+  'imagerepos' => [],
+  'name' => 'docker'
+};
+
+$result = Build::Docker::parse($conf, \$dockerfile);
+is_deeply($result, $expected);