Ensure that additional tars are passed through in a correct fashion

rpm/rpm.bzl

@@ -30,7 +30,7 @@ def _rpms_impl(ctx, rpms = None):
     )
     tars = [finaltar]
     if ctx.attr.tars:
-        tars = tars + ctx.attr.tars
+        tars = tars + ctx.files.tars
     return _container.image.implementation(ctx, tars = tars)
 
 _rpms_layer = rule(

test/BUILD

@@ -23,3 +23,9 @@ container_test(
     configs = ["configs/allinone.yaml"],
     image = "//testdata:allinone_no_base",
 )
+
+container_test(
+    name = "image_with_extra_tar_test",
+    configs = ["configs/image_with_extra_tar.yaml"],
+    image = "//testdata:image_with_extra_tar",
+)

test/configs/allinone.yaml

@@ -11,4 +11,7 @@ fileExistenceTests:
 - name: 'readme from ca-certificates'
   path: '/usr/share/pki/ca-trust-source/README'
   shouldExist: true
-  permissions: '-rw-r--r--'
+  permissions: '-rw-r--r--'
+- name: '/etc/test/foo should be there'
+  path: '/etc/test/foo'
+  shouldExist: false

test/configs/image_with_extra_tar.yaml

@@ -0,0 +1,21 @@
+schemaVersion: '2.0.0'
+fileExistenceTests:
+- name: 'ldconfig binary from glibc'
+  path: '/sbin/ldconfig'
+  shouldExist: true
+  permissions: '-rwxr-xr-x'
+- name: 'rpm database file'
+  path: '/var/lib/rpm/Packages'
+  shouldExist: true
+  permissions: '-rw-r--r--'
+- name: 'readme from ca-certificates should not be there'
+  path: '/usr/share/pki/ca-trust-source/README'
+  shouldExist: false
+- name: '/foo should be there'
+  path: '/foo'
+  shouldExist: true
+  permissions: '-rw-r--r--'
+- name: '/etc/test/foo should be there'
+  path: '/etc/test/foo'
+  shouldExist: true
+  permissions: '-rw-r--r--'

testdata/BUILD

@@ -1,5 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
+load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
+
 load(
     "@io_bazel_rules_docker//container:container.bzl",
     "container_image",
@@ -38,3 +40,17 @@ rpm_image(
     base = ":files_base",
     rpms = ["@glibc//file"],
 )
+
+rpm_image(
+    name = "image_with_extra_tar",
+    base = ":files_base",
+    rpms = ["@glibc//file"],
+    tars = [":foo_tar"],
+)
+
+pkg_tar(
+    name = "foo_tar",
+    srcs = ["foo"],
+    mode = "0o644",
+    package_dir = "/etc/test",
+)