Skip to content

Commit

Permalink
Update was due
Browse files Browse the repository at this point in the history
* Adds service.Ports, service.Fqdn and container.State to metadata
context
* Adds support for running a check command against a staging file
before overwriting the target
* Fall back to file copy when renaming fails due to staging and
destination files living in different mounts
* Updates Godeps
* Some smaller code changes
  • Loading branch information
janeczku committed Sep 10, 2016
1 parent f731b37 commit e80fcdf
Show file tree
Hide file tree
Showing 105 changed files with 15,336 additions and 3,559 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
/dist
/artifacts
/test
rancher-template*
rancher-gen
secrets.txt
.DS_Store
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:edge
MAINTAINER Jan Broer <jan@festplatte.eu.org>
MAINTAINER <jan@rancher.com>

RUN apk add --no-cache ca-certificates

ENV RANCHER_TEMPLATE_RELEASE v0.1.1
ENV RANCHER_GEN_RELEASE v0.2.0

ADD https://github.com/janeczku/rancher-template/releases/download/${RANCHER_TEMPLATE_RELEASE}/rancher-template-linux-amd64.tar.gz /tmp/rancher-template.tar.gz
RUN tar -zxvf /tmp/rancher-template.tar.gz -C /usr/local/bin \
&& chmod +x /usr/local/bin/rancher-template
ADD https://github.com/janeczku/go-rancher-gen/releases/download/${RANCHER_GEN_RELEASE}/rancher-gen-linux-amd64.tar.gz /tmp/rancher-gen.tar.gz
RUN tar -zxvf /tmp/rancher-gen.tar.gz -C /usr/local/bin \
&& chmod +x /usr/local/bin/rancher-gen

ENTRYPOINT ["/usr/local/bin/rancher-template"]
ENTRYPOINT ["/usr/local/bin/rancher-gen"]
10 changes: 5 additions & 5 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ MAINTAINER Jan Broer <[email protected]>

RUN apk add --no-cache ca-certificates

ADD build/rancher-template-linux-amd64 /usr/local/bin/rancher-template
RUN chmod +x /usr/local/bin/rancher-template
ADD build/rancher-gen-linux-amd64 /usr/local/bin/rancher-gen
RUN chmod +x /usr/local/bin/rancher-gen

COPY ./test /etc/rancher-template/
COPY ./test /etc/rancher-gen/

ENTRYPOINT ["/usr/local/bin/rancher-template"]
CMD ["--config", "/etc/rancher-template/config.toml"]
ENTRYPOINT ["/usr/local/bin/rancher-gen"]
CMD ["--config", "/etc/rancher-gen/config.toml"]
8 changes: 4 additions & 4 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 26 additions & 22 deletions Godeps/_workspace/src/github.com/BurntSushi/toml/decode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 49 additions & 30 deletions Godeps/_workspace/src/github.com/BurntSushi/toml/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e80fcdf

Please sign in to comment.