Skip to content

Commit

Permalink
Reorganize repo.
Browse files Browse the repository at this point in the history
  • Loading branch information
dlorenc committed Jun 5, 2018
1 parent 13bfdf4 commit 0fdd3cd
Show file tree
Hide file tree
Showing 20 changed files with 19 additions and 15 deletions.
16 changes: 8 additions & 8 deletions BUILD
Expand Up @@ -18,14 +18,14 @@ docker_bundle(
"gcr.io/{PROJECT_ID}/java:debug": "//java:debug",
"gcr.io/{PROJECT_ID}/java/jetty:latest": "//java/jetty",
"gcr.io/{PROJECT_ID}/java/jetty:debug": "//java/jetty:debug",
"gcr.io/{PROJECT_ID}/python3:latest": "//python3:python3",
"gcr.io/{PROJECT_ID}/python3:debug": "//python3:debug",
"gcr.io/{PROJECT_ID}/python2.7:latest": "//python2.7:python27",
"gcr.io/{PROJECT_ID}/python2.7:debug": "//python2.7:debug",
"gcr.io/{PROJECT_ID}/nodejs:latest": "//nodejs",
"gcr.io/{PROJECT_ID}/nodejs:debug": "//nodejs:debug",
"gcr.io/{PROJECT_ID}/dotnet:latest": "//dotnet",
"gcr.io/{PROJECT_ID}/dotnet:debug": "//dotnet:debug",
"gcr.io/{PROJECT_ID}/python3:latest": "//experimental/python3:python3",
"gcr.io/{PROJECT_ID}/python3:debug": "//experimental/python3:debug",
"gcr.io/{PROJECT_ID}/python2.7:latest": "//experimental/python2.7:python27",
"gcr.io/{PROJECT_ID}/python2.7:debug": "//experimental/python2.7:debug",
"gcr.io/{PROJECT_ID}/nodejs:latest": "//experimental/nodejs",
"gcr.io/{PROJECT_ID}/nodejs:debug": "//experimental/nodejs:debug",
"gcr.io/{PROJECT_ID}/dotnet:latest": "//experimental/dotnet",
"gcr.io/{PROJECT_ID}/dotnet:debug": "//experimental/dotnet:debug",
},
stamp = True,
)
Expand Down
5 changes: 4 additions & 1 deletion README.md
Expand Up @@ -42,6 +42,10 @@ Follow these steps to get started:
* Pick the right base image for your application stack
We publish the following distroless base images on `gcr.io`:
* [gcr.io/distroless/base](base/README.md)
* [gcr.io/distroless/java](java/README.md)
* [gcr.io/distroless/cc](cc/README.md)

* The following images are also published on `gcr.io`, but are considered experimental and not recommended for production usage:
* [gcr.io/distroless/python2.7](python2.7/README.md)
* [gcr.io/distroless/python3](python3/README.md)
* [gcr.io/distroless/nodejs](nodejs/README.md)
Expand Down Expand Up @@ -77,7 +81,6 @@ Follow these steps to get started:

You can find other examples here:


* [Java](examples/java/Dockerfile)
* [Python](examples/python2.7/Dockerfile)
* [Python 3](examples/python3/Dockerfile)
Expand Down
2 changes: 1 addition & 1 deletion base/BUILD
Expand Up @@ -90,7 +90,7 @@ docker_build(
directory = "/",
entrypoint = ["/busybox/sh"],
env = {"PATH": "$PATH:/busybox"},
tars = ["//busybox:busybox.tar"],
tars = ["//experimental/busybox:busybox.tar"],
)

structure_test(
Expand Down
2 changes: 1 addition & 1 deletion examples/dotnet/BUILD
Expand Up @@ -5,7 +5,7 @@ load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")

docker_build(
name = "hello",
base = "//dotnet:dotnet",
base = "//experimental/dotnet:dotnet",
cmd = [
"dotnet",
"/bin/Release/netcoreapp2.0/hello.dll",
Expand Down
4 changes: 2 additions & 2 deletions examples/nodejs/BUILD
Expand Up @@ -6,14 +6,14 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
# https://howtonode.org/hello-node
docker_build(
name = "hello",
base = "//nodejs:nodejs",
base = "//experimental/nodejs:nodejs",
cmd = ["hello.js"],
files = [":hello.js"],
)

docker_build(
name = "hello_http",
base = "//nodejs:nodejs",
base = "//experimental/nodejs:nodejs",
cmd = ["hello_http.js"],
files = [":hello_http.js"],
ports = ["8000"],
Expand Down
2 changes: 1 addition & 1 deletion examples/python2.7/BUILD
Expand Up @@ -4,7 +4,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
py_image(
name = "hello_py",
srcs = ["hello.py"],
base = "//python2.7:python27",
base = "//experimental/python2.7:python27",
main = "hello.py",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/python3/BUILD
Expand Up @@ -4,7 +4,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_build")
py_image(
name = "hello_py",
srcs = ["hello.py"],
base = "//python3:python3",
base = "//experimental/python3:python3",
main = "hello.py",
)

Expand Down
1 change: 1 addition & 0 deletions experimental/BUILD
@@ -0,0 +1 @@
package(default_visibility = ["//visibility:public"])
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 0fdd3cd

Please sign in to comment.