Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"

http_archive(
name = "io_bazel_rules_docker",
sha256 = "aed1c249d4ec8f703edddf35cbe9dfaca0b5f5ea6e4cd9e83e99f3b0d1136c3d",
strip_prefix = "rules_docker-0.7.0",
urls = ["https://github.com/bazelbuild/rules_docker/archive/v0.7.0.tar.gz"],
sha256 = "4349f2b0b45c860dd2ffe18802e9f79183806af93ce5921fb12cbd6c07ab69a8",
strip_prefix = "rules_docker-0.21.0",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.21.0/rules_docker-v0.21.0.tar.gz"],
)

load(
Expand All @@ -14,14 +14,18 @@ load(

container_repositories()

load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")

container_deps()

http_file(
name = "glibc",
sha256 = "573ceb6ad74b919b06bddd7684a29ef75bc9f3741e067fac1414e05c0087d0b6",
urls = ["https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/os/Packages/g/glibc-2.27-8.fc28.x86_64.rpm"],
urls = ["https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/28/Everything/x86_64/os/Packages/g/glibc-2.27-8.fc28.x86_64.rpm"],
)

http_file(
name = "ca_certificates",
sha256 = "dfc3d2bf605fbea7db7f018af53fe0563628f788a40cb1e7f84434606b7b6a12",
urls = ["https://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/os/Packages/c/ca-certificates-2018.2.22-3.fc28.noarch.rpm"],
urls = ["https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/28/Everything/x86_64/os/Packages/c/ca-certificates-2018.2.22-3.fc28.noarch.rpm"],
)
5 changes: 3 additions & 2 deletions rpm/rpm.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@ def _rpms_impl(ctx, rpms = None):
parent_parts = _get_layers(ctx, ctx.label.name, ctx.attr.base)
uncompressed_blobs = parent_parts.get("unzipped_layer", [])
uncompressed_layer_args = ["--uncompressed_layer=" + f.path for f in uncompressed_blobs]
rpm_args = ["--rpm=" + f.path for f in rpms]
rpm_args = ["--", rpm_installer.path] + ["--rpm=" + f.path for f in rpms]
finaltar = ctx.actions.declare_file(ctx.label.name + "-installed-rpms.tar")
target = "--output=%s" % finaltar.path
ctx.actions.run(
executable = rpm_installer,
executable = 'fakeroot',
arguments = rpm_args + uncompressed_layer_args + [target],
inputs = rpms + uncompressed_blobs,
outputs = [finaltar],
use_default_shell_env = True,
progress_message = "Install RPMs inside a container",
mnemonic = "installrpms",
tools = [rpm_installer],
)
tars = [finaltar]
if ctx.attr.tars:
Expand Down
8 changes: 8 additions & 0 deletions test/configs/allinone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,22 @@ fileExistenceTests:
path: '/sbin/ldconfig'
shouldExist: true
permissions: '-rwxr-xr-x'
uid: 0
gid: 0
- name: 'rpm database file'
path: '/var/lib/rpm/Packages'
shouldExist: true
permissions: '-rw-r--r--'
uid: 0
gid: 0
- name: 'readme from ca-certificates'
path: '/usr/share/pki/ca-trust-source/README'
shouldExist: true
permissions: '-rw-r--r--'
uid: 0
gid: 0
- name: '/etc/test/foo should be there'
path: '/etc/test/foo'
shouldExist: false
uid: 0
gid: 0