Skip to content
This repository has been archived by the owner on Feb 6, 2024. It is now read-only.

Update rules_docker pin #496

Merged
merged 4 commits into from
Jan 13, 2020
Merged
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@ bazel-bin
bazel-genfiles
bazel-out
bazel-testlogs

# Npm packages
node_modules
13 changes: 6 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -294,14 +294,11 @@ _controller_pip_install()

http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "b996a3ce55c49ae359468dae040b30025fdc0917f67b08c36929ecb1ea02907e",
strip_prefix = "rules_nodejs-0.16.3",
urls = ["https://github.com/bazelbuild/rules_nodejs/archive/0.16.3.zip"],
sha256 = "a54b2511d6dae42c1f7cdaeb08144ee2808193a088004fc3b464a04583d5aa2e",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.42.3/rules_nodejs-0.42.3.tar.gz"],
)

load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories", "npm_install")

node_repositories(package_json = ["//examples/hellohttp/nodejs:package.json"])
load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install")

# We use nodejs_image to build a sample service
load(
Expand All @@ -311,9 +308,11 @@ load(

_nodejs_image_repos()

npm_install(
yarn_install(
name = "examples_hellohttp_npm",
package_json = "//examples/hellohttp/nodejs:package.json",
symlink_node_modules = False,
yarn_lock = "//examples:yarn.lock",
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion examples/hellohttp/nodejs/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ licenses(["notice"]) # Apache 2.0
nodejs_image(
name = "server",
data = [":server.js"],
entry_point = "io_bazel_rules_k8s/examples/hellohttp/nodejs/server.js",
entry_point = "@io_bazel_rules_k8s//examples/hellohttp/nodejs:server.js",
node_modules = "@examples_hellohttp_npm//:node_modules",
)

Expand Down
8 changes: 8 additions & 0 deletions examples/yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


jsesc@2.5.2:
version "2.5.2"
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
6 changes: 3 additions & 3 deletions k8s/k8s.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ py_library(
if "io_bazel_rules_docker" not in excludes:
http_archive(
name = "io_bazel_rules_docker",
sha256 = "14ac30773fdb393ddec90e158c9ec7ebb3f8a4fd533ec2abbfd8789ad81a284b",
strip_prefix = "rules_docker-0.12.1",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.12.1/rules_docker-v0.12.1.tar.gz"],
sha256 = "df13123c44b4a4ff2c2f337b906763879d94871d16411bf82dcfeba892b58607",
strip_prefix = "rules_docker-0.13.0",
urls = ["https://github.com/bazelbuild/rules_docker/releases/download/v0.13.0/rules_docker-v0.13.0.tar.gz"],
)
if "bazel_skylib" not in excludes:
http_archive(
Expand Down