Skip to content

Commit

Permalink
Merge pull request GoogleContainerTools#129 from xingao267/cacerts
Browse files Browse the repository at this point in the history
Remove hardcoded @package_bundle repo in cacerts.bzl.
  • Loading branch information
r2d4 authored Nov 13, 2017
2 parents d1ccf71 + baa56b5 commit 21a50eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions base/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ passwd_file(
username = "root",
)

load("@package_bundle//file:packages.bzl", "packages")
load("//cacerts:cacerts.bzl", "cacerts")

cacerts(
name = "cacerts",
deb = packages["ca-certificates"],
)

load("@package_bundle//file:packages.bzl", "packages")

# Create /tmp, too many things assume it exists.
# tmp.tar has a /tmp with the correct permissions 01777
# A tar is needed because at the moment there is no way to create a diretory with specific permissions
Expand Down
4 changes: 1 addition & 3 deletions cacerts/cacerts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ def _impl(ctx):
inputs = [ctx.executable._extract, ctx.file.deb],
outputs = [ctx.outputs.out])

load("@package_bundle//file:packages.bzl", "packages")

cacerts = rule(
attrs = {
"deb": attr.label(
default = Label(packages["ca-certificates"]),
allow_files = [".deb"],
single_file = True,
mandatory = True,
),
# Implicit dependencies.
"_extract": attr.label(
Expand Down

0 comments on commit 21a50eb

Please sign in to comment.