Import rules_pkg repository

Also update sha256sums in tests and remove now-deprecated tests of timestamp functionality

container/BUILD

@@ -44,7 +44,7 @@ py_library(
     visibility = ["//visibility:public"],
     deps = [
         "@bazel_tools//third_party/py/gflags",
-        "@rules_pkg//pkg:archive",
+        "@rules_pkg//:archive",
     ],
 )
 

container/build_tar.py

@@ -25,7 +25,7 @@
 import tarfile
 import tempfile
 
-from tools.build_defs.pkg import archive
+from rules_pkg import archive
 from third_party.py import gflags
 
 gflags.DEFINE_string('output', None, 'The output file, mandatory')

container/image_test.py

@@ -91,7 +91,7 @@ def test_files_in_layer_with_file_base(self):
 
   def test_tar_base(self):
     with TestImage('tar_base') as img:
-      self.assertDigest(img, '611270a900f1d95f896af3d8c38ff04f75d75f972c02eab0403aa12847881489')
+      self.assertDigest(img, '9fdc5d975efcc73690089a2eedaa28557ce7a792baa1fcd5e56949fb637c38f2')
       self.assertEqual(1, len(img.fs_layers()))
       self.assertTopLayerContains(img, [
         './usr', './usr/bin', './usr/bin/unremarkabledeath'])
@@ -100,15 +100,15 @@ def test_tar_base(self):
 
   def test_tar_with_tar_base(self):
     with TestImage('tar_with_tar_base') as img:
-      self.assertDigest(img, '07a2a6a8547551b318b525cf3388a5515060d3cc4354657b8b2e84c8ea6105c9')
+      self.assertDigest(img, '74a5e7d7db47bb3bff9307a32fa4139a16c44fc755e0eb83b5aee4a7d8684134')
       self.assertEqual(2, len(img.fs_layers()))
       self.assertTopLayerContains(img, [
         './asdf', './usr', './usr/bin',
         './usr/bin/miraclegrow'])
 
   def test_tars_in_layer_with_tar_base(self):
     with TestImage('tars_in_layer_with_tar_base') as img:
-      self.assertDigest(img, 'feb6575d686ca8dc96015322c120f786baaa3509d5795ad2d43b9302433f297e')
+      self.assertDigest(img, '808a789871391de15fd880be67634ea01314ea60e49019e3a384004bae682d97')
       self.assertEqual(3, len(img.fs_layers()))
       self.assertTopLayerContains(img, [
         './asdf', './usr', './usr/bin',
@@ -119,29 +119,29 @@ def test_tars_in_layer_with_tar_base(self):
 
   def test_directory_with_tar_base(self):
     with TestImage('directory_with_tar_base') as img:
-      self.assertDigest(img, 'c81286d84de3bd284b517de070f2813233fb296143acfb3724cca2558bd44086')
+      self.assertDigest(img, 'b019ed77aa1432a3f275f3751f4a1c128077380e88bca2b85ab93b6a1d2181e6')
       self.assertEqual(2, len(img.fs_layers()))
       self.assertTopLayerContains(img, [
         '.', './foo', './foo/asdf', './foo/usr',
         './foo/usr/bin', './foo/usr/bin/miraclegrow'])
 
   def test_files_with_tar_base(self):
     with TestImage('files_with_tar_base') as img:
-      self.assertDigest(img, 'ea1dd1fd76aea45ce08573b80202408af40c05c4091a558b5e90ba2785d875aa')
+      self.assertDigest(img, '4176cfcba4db4978382943ee36e4ed62b984a4144cc79b749cdbacf71adf524c')
       self.assertEqual(2, len(img.fs_layers()))
       self.assertTopLayerContains(img, ['.', './bar'])
 
   def test_workdir_with_tar_base(self):
     with TestImage('workdir_with_tar_base') as img:
-      self.assertDigest(img, 'c3b1757b19e007ae28cb456daa6bc0d37531804e750ef3d22ac20f29f2b76aa4')
+      self.assertDigest(img, 'e4ec186a27a182d1e736c8e430def54c64ec801091d226b3bbee3a145c78705f')
       self.assertEqual(2, len(img.fs_layers()))
       self.assertTopLayerContains(img, [])
       # Check that the working directory property has been properly configured.
       self.assertConfigEqual(img, 'WorkingDir', '/tmp')
 
   def test_tar_with_files_base(self):
     with TestImage('tar_with_files_base') as img:
-      self.assertDigest(img, '9f11c380bd9d72b9be0c0e6369705e8b13b70e2af70a8f7bf1584c0580bcb63e')
+      self.assertDigest(img, '634cc233fc5be1739741deebbdab3ae35f8a8da963687ab3157301bfac9b2cc9')
       self.assertEqual(2, len(img.fs_layers()))
       self.assertTopLayerContains(img, [
         './asdf', './usr', './usr/bin',
@@ -155,15 +155,15 @@ def test_docker_tarball_base(self):
 
   def test_layers_with_docker_tarball_base(self):
     with TestImage('layers_with_docker_tarball_base') as img:
-      self.assertDigest(img, '0d6ae1aa69ff75c0d985619d73bc06b05669835a9300a799aa68392e5f92b983')
+      self.assertDigest(img, '699c4e037fe3446c8e1f8ebd8aacdc0b4b392ec764dc8558c3654e05eb1ee5fe')
       self.assertEqual(5, len(img.fs_layers()))
       self.assertTopLayerContains(img, ['.', './foo'])
       self.assertLayerNContains(img, 1, ['.', './three', './three/three'])
       self.assertLayerNContains(img, 2, ['.', './baz'])
 
   def test_base_with_entrypoint(self):
     with TestImage('base_with_entrypoint') as img:
-      self.assertDigest(img, '2b4114ac954ad863da264deb69586f43dd6ff1cb937c057cd11771b361436f73')
+      self.assertDigest(img, '69cd919e2d000d67f29c10b77c0d6438205b7b89ad9712030424d02edd131cd9')
       self.assertEqual(1, len(img.fs_layers()))
       self.assertConfigEqual(img, 'Entrypoint', ['/bar'])
       self.assertConfigEqual(img, 'ExposedPorts', {'8080/tcp': {}})
@@ -176,7 +176,7 @@ def test_dashdash_entrypoint(self):
 
   def test_derivative_with_cmd(self):
     with TestImage('derivative_with_cmd') as img:
-      self.assertDigest(img, '709e155a071ea177fad8ae737ab405124a859d6a7c81c0ee868dccc8d27ae314')
+      self.assertDigest(img, '80e6edd6de9d54c91350293153cd777793225899154df79de060badd23c44a2a')
       self.assertEqual(3, len(img.fs_layers()))
 
       self.assertConfigEqual(img, 'Entrypoint', ['/bar'])
@@ -216,48 +216,6 @@ def test_with_rfc_3339_creation_time(self):
       cfg = json.loads(img.config_file())
       self.assertEqual('1989-05-03T12:58:12.345Z', cfg.get('created', ''))
 
-  # This test is flaky. If it fails, do a bazel clean --expunge_async and try again
-  def test_with_stamped_creation_time(self):
-    with TestImage('with_stamped_creation_time') as img:
-      self.assertEqual(2, len(img.fs_layers()))
-      cfg = json.loads(img.config_file())
-      created_str = cfg.get('created', '')
-      self.assertNotEqual('', created_str)
-
-      now = datetime.datetime.utcnow()
-
-      created = datetime.datetime.strptime(created_str, '%Y-%m-%dT%H:%M:%SZ')
-
-      # The BUILD_TIMESTAMP is set by Bazel to Java's CurrentTimeMillis / 1000,
-      # or env['SOURCE_DATE_EPOCH']. For Bazel versions before 0.12, there was
-      # a bug where CurrentTimeMillis was not divided by 1000.
-      # See https://github.com/bazelbuild/bazel/issues/2240
-      # https://bazel-review.googlesource.com/c/bazel/+/48211
-      # Assume that any value for 'created' within a reasonable bound is fine.
-      self.assertLessEqual(now - created, datetime.timedelta(minutes=15))
-
-  # This test is flaky. If it fails, do a bazel clean --expunge_async and try again
-  def test_with_default_stamped_creation_time(self):
-    # {BUILD_TIMESTAMP} should be the default when `stamp = True` and
-    # `creation_time` isn't explicitly defined.
-    with TestImage('with_default_stamped_creation_time') as img:
-      self.assertEqual(2, len(img.fs_layers()))
-      cfg = json.loads(img.config_file())
-      created_str = cfg.get('created', '')
-      self.assertNotEqual('', created_str)
-
-      now = datetime.datetime.utcnow()
-
-      created = datetime.datetime.strptime(created_str, '%Y-%m-%dT%H:%M:%SZ')
-
-      # The BUILD_TIMESTAMP is set by Bazel to Java's CurrentTimeMillis / 1000,
-      # or env['SOURCE_DATE_EPOCH']. For Bazel versions before 0.12, there was
-      # a bug where CurrentTimeMillis was not divided by 1000.
-      # See https://github.com/bazelbuild/bazel/issues/2240
-      # https://bazel-review.googlesource.com/c/bazel/+/48211
-      # Assume that any value for 'created' within a reasonable bound is fine.
-      self.assertLessEqual(now - created, datetime.timedelta(minutes=15))
-
   def test_with_env(self):
     with TestBundleImage(
         'with_env', 'bazel/%s:with_env' % TEST_DATA_TARGET_BASE) as img:
@@ -370,7 +328,7 @@ def test_bundle(self):
     )) as img:
         self.assertDigest(img, '8d6a7bc0542324744200c2d09d18b54497d2e3e90ba1383c5b4ccae88b8cdf45')
     with TestBundleImage('bundle_test', 'docker.io/ubuntu:latest') as img:
-      self.assertDigest(img, '2b4114ac954ad863da264deb69586f43dd6ff1cb937c057cd11771b361436f73')
+      self.assertDigest(img, '69cd919e2d000d67f29c10b77c0d6438205b7b89ad9712030424d02edd131cd9')
       self.assertEqual(1, len(img.fs_layers()))
     with TestBundleImage(
         'bundle_test', 'us.gcr.io/google-appengine/base:fresh') as img:
@@ -407,7 +365,7 @@ def test_build_with_tag(self):
 
   def test_with_passwd(self):
     with TestImage('with_passwd') as img:
-      self.assertDigest(img, '2d9d8c80f8583bfcc5276835836f01682e49abead17c5a4dab7293b019943545')
+      self.assertDigest(img, '8b70d2910935a462df24d58c3fb4eac969a17c17f66fa2623c3486d93fd720f1')
       self.assertEqual(1, len(img.fs_layers()))
       self.assertTopLayerContains(img, ['.', './etc', './etc/passwd'])
 
@@ -438,7 +396,7 @@ def test_with_passwd_tar(self):
 
   def test_with_group(self):
     with TestImage('with_group') as img:
-      self.assertDigest(img, '606b33644870f6b50d6675a6c717c028bde28c64ec6c004c46a23d4d65b2216a')
+      self.assertDigest(img, '9323c6856e16101606049e4513bf41792daa1d768415333b926c3d3721f99376')
       self.assertEqual(1, len(img.fs_layers()))
       self.assertTopLayerContains(img, ['.', './etc', './etc/group'])
 

repositories/repositories.bzl

@@ -143,6 +143,13 @@ def repositories():
             urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz"],
         )
 
+    if "rules_pkg" not in excludes:
+        http_archive(
+            name = "rules_pkg",
+            sha256 = "a5cca9cf01c7fcfe4aab8ef54ce590e49c4921fa0d4d194b5f0ad732a8b207c4",
+            urls = ["https://github.com/bazelbuild/rules_pkg/releases/download/0.2.6/rules_pkg-0.2.6.tar.gz"],
+        )
+
     native.register_toolchains(
         # Register the default docker toolchain that expects the 'docker'
         # executable to be in the PATH

testdata/BUILD

@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary")
 load("@io_bazel_rules_go//go:def.bzl", "go_binary")
 load("@npm_bazel_typescript//:index.bzl", "ts_library")
 load("@pip_deps//:requirements.bzl", "requirement")
+load("@rules_pkg//:pkg.bzl", "pkg_tar")
 load("//cc:image.bzl", "cc_image")
 load(
     "//container:container.bzl",

tests/container/BUILD

@@ -608,7 +608,7 @@ file_test(
 
 file_test(
     name = "alpine_custom_attr_digest_test",
-    content = "sha256:f757e72211b4ed612e147248bbbb8ce134cf70124d8850d70607d9ba53a28377",
+    content = "sha256:a962af02dee6e64a20f4b5300d5def30ebb655367fed73d7b4f0300567064b7e",
     file = ":new_push_test_legacy_from_container_img.digest",
 )