Skip to content
This repository has been archived by the owner on May 4, 2021. It is now read-only.

Switch to using uber-container-tools project for image registry #305

Merged
merged 2 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Update readme
  • Loading branch information
Yiran Wang committed Feb 11, 2020
commit 484b968ec8d5f9f7cc866e6ca0e31b34a1145982
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ To build Dockerfiles that contain RUN, Makisu needs to run in a container.
To try it locally, the following snippet can be placed inside your `~/.bashrc` or `~/.zshrc`:
```shell
function makisu_build() {
makisu_version=${MAKISU_VERSION:-v0.1.11}
makisu_version=${MAKISU_VERSION:-latest}
cd ${@: -1}
docker run -i --rm --net host \
-v /var/run/docker.sock:/docker.sock \
Expand Down
21 changes: 20 additions & 1 deletion bin/makisu/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ Global Flags:
--log-level string Verbose level of logs. Valid values are "debug", "info", "warn", "error" (default "info")
--log-output string The output file path for the logs. Set to "stdout" to output to stdout (default "stdout")

$ makisu push --help
Push docker image to registries

Usage:
makisu push -t=<image_tag> [flags] <image_tar_path>

Flags:
-t, --tag string Image tag (required)
--push stringArray Registry to push image to
--replica stringArray Push targets with alternative full image names "<registry>/<repo>:<tag>"
--registry-config string Set build-time variables
-h, --help help for push

Global Flags:
--cpu-profile Profile the application
--log-fmt string The format of the logs. Valid values are "json" and "console" (default "json")
--log-level string Verbose level of logs. Valid values are "debug", "info", "warn", "error" (default "info")
--log-output string The output file path for the logs. Set to "stdout" to output to stdout (default "stdout")

$ makisu version
v0.1.11
v0.1.14
```
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ To build Dockerfiles that contain RUN, Makisu needs to run in a container.
To try it locally, the following snippet can be placed inside your `~/.bashrc` or `~/.zshrc`:
```shell
function makisu_build() {
makisu_version=${MAKISU_VERSION:-v0.1.11}
makisu_version=${MAKISU_VERSION:-latest}
cd ${@: -1}
docker run -i --rm --net host \
-v /var/run/docker.sock:/docker.sock \
Expand Down
2 changes: 1 addition & 1 deletion examples/k8s/github-job-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
mountPath: /makisu-context
containers:
- name: makisu
image: gcr.io/uber-container-tools/makisu:v0.1.11
image: gcr.io/uber-container-tools/makisu:latest
imagePullPolicy: IfNotPresent
args:
- build
Expand Down
4 changes: 2 additions & 2 deletions examples/k8s/github-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ spec:
mountPath: /makisu-context
containers:
- name: makisu
image: gcr.io/uber-container-tools/makisu:v0.1.11
image: gcr.io/uber-container-tools/makisu:latest
imagePullPolicy: IfNotPresent
args:
- build
- --push=gcr.io
- --modifyfs=true
- -t=uber-container-tools/example-github:v0.1.11
- -t=uber-container-tools/example-github:latest
- --registry-config=/registry-config/registry.yaml
- /makisu-context
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion site/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ <h2 id="makisu-anywhere">Makisu anywhere</h2>
To try it locally, the following snippet can be placed inside your <code>~/.bashrc</code> or
<code>~/.zshrc</code>:</p>
<pre><code class="shell">function makisu_build() {
makisu_version=${MAKISU_VERSION:-v0.1.11}
makisu_version=${MAKISU_VERSION:-latest}
cd ${@: -1}
docker run -i --rm --net host \
-v /var/run/docker.sock:/docker.sock \
Expand Down
4 changes: 2 additions & 2 deletions site/search/search_index.json

Large diffs are not rendered by default.