Skip to content

Commit

Permalink
Move Jetty as discussed offline and add it to cloudbuild.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmoor committed May 18, 2017
1 parent 656e5a1 commit 3410c5e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
6 changes: 6 additions & 0 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ steps:
- name: gcr.io/cloud-builders/docker
args: ['tag', 'bazel/java:java8', 'gcr.io/$PROJECT_ID/java:latest']

- name: gcr.io/cloud-builders/bazel
args: ['run', '//java/jetty']
- name: gcr.io/cloud-builders/docker
args: ['tag', 'bazel/java/jetty:jetty', 'gcr.io/$PROJECT_ID/java/jetty:latest']

# The resulting images to push to GCR.
images: [
'gcr.io/$PROJECT_ID/base:latest',
'gcr.io/$PROJECT_ID/java:latest',
'gcr.io/$PROJECT_ID/java/jetty:latest',
]
9 changes: 0 additions & 9 deletions java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,3 @@ docker_build(
# cmd = ["/path/to/deploy.jar", "--option1", ...]
],
)

docker_build(
name = "jetty",
base = ":java8",
cmd = ["/jetty/start.jar"],
tars = ["@jetty//:tar"],
workdir = "/jetty",
# We expect users to add their WAR under /jetty/webapps.
)
12 changes: 12 additions & 0 deletions java/jetty/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package(default_visibility = ["//visibility:public"])

load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")

docker_build(
name = "jetty",
base = "//java:java8",
cmd = ["/jetty/start.jar"],
tars = ["@jetty//:tar"],
workdir = "/jetty",
# We expect users to add their WAR under /jetty/webapps.
)

0 comments on commit 3410c5e

Please sign in to comment.