Skip to content

Commit 3861032

Browse files
committed
chore(fluentd): rename parts from deis to hephy
Signed-off-by: Cryptophobia <aouzounov@gmail.com>
1 parent 0557fcc commit 3861032

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
manifests/*.tmp.yaml
2-
rootfs/fluentd/deis-output/pkg
2+
rootfs/fluentd/hephy-output/pkg
33
rootfs/*.gem

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHORT_NAME ?= fluentd
22
BUILD_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

66
include versioning.mk
77

@@ -13,7 +13,7 @@ docker-build:
1313
docker tag ${IMAGE} ${MUTABLE_IMAGE}
1414

1515
test: 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

1818
install:
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

2424
uninstall:
25-
helm delete fluentd --purge
25+
helm delete fluentd --purge

charts/fluentd/Chart.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: fluentd
22
home: https://github.com/teamhephy/fluentd
33
version: <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.
55
maintainers:
6-
- name: Deis Team
7-
email: engineering@deis.com
6+
- name: Team Hephy
7+
email: team@teamhephy.com

rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN chmod +x /bin/entrypoint.sh
66

77
RUN apk add bash findutils
88
RUN 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 \

rootfs/entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

3-
exec "$@"
3+
su-exec fluent "$@"

0 commit comments

Comments
 (0)