File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11manifests /* .tmp.yaml
2- rootfs /fluentd /deis -output /pkg
2+ rootfs /fluentd /hephy -output /pkg
33rootfs /* .gem
Original file line number Diff line number Diff line change 11SHORT_NAME ?= fluentd
22BUILD_TAG ?= git-$(shell git rev-parse --short HEAD)
3- DEIS_REGISTRY ?= ${DEV_REGISTRY}
4- IMAGE_PREFIX ?= deis
3+ HEPHY_REGISTRY ?= ${DEV_REGISTRY}
4+ IMAGE_PREFIX ?= hephy
55
66include versioning.mk
77
@@ -13,7 +13,7 @@ docker-build:
1313 docker tag ${IMAGE} ${MUTABLE_IMAGE}
1414
1515test : docker-build
16- docker run ${IMAGE} /bin/bash -c " cd /fluentd/deis -output && rake test"
16+ docker run ${IMAGE} /bin/bash -c " cd /fluentd/hephy -output && rake test"
1717
1818install :
1919 helm upgrade fluentd charts/fluentd --install --namespace deis --set org=${IMAGE_PREFIX} ,docker_tag=${VERSION}
@@ -22,4 +22,4 @@ upgrade:
2222 helm upgrade fluentd charts/fluentd --namespace deis --set org=${IMAGE_PREFIX} ,docker_tag=${VERSION}
2323
2424uninstall :
25- helm delete fluentd --purge
25+ helm delete fluentd --purge
Original file line number Diff line number Diff line change 11name : fluentd
22home : https://github.com/teamhephy/fluentd
33version : <Will be populated by the ci before publishing the chart>
4- description : Log shipping mechanism for Deis Workflow.
4+ description : Log shipping mechanism for Hephy Workflow.
55maintainers :
6- - name : Deis Team
7- email : engineering@deis .com
6+ - name : Team Hephy
7+ email : team@teamhephy .com
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ RUN chmod +x /bin/entrypoint.sh
66
77RUN apk add bash findutils
88RUN apk add --update --virtual .build-deps sudo build-base ruby-dev \
9- && gem install bundler \
9+ && gem install bundler:1.17.3 \
1010 && bundle config --global silence_root_warning 1 \
1111 && bundle install --gemfile=/fluentd/deis-output/Gemfile \
1212 && rake --rakefile=/fluentd/deis-output/Rakefile build \
Original file line number Diff line number Diff line change 1- #! /bin/sh
1+ #! /bin/bash
22
3- exec " $@ "
3+ su- exec fluent " $@ "
You can’t perform that action at this time.
0 commit comments