Skip to content

Avoid removing white space #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pulledtim wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid removing white space #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78ecf61
Avoid removing white space
pulledtim Oct 7, 2019
e39fa36
Remove user from dockerfile
pulledtim Oct 8, 2019
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
6 changes: 1 addition & 5 deletions dockerfile/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
FROM errbit/errbit:latest
FROM errbit/errbit:v0.8.0

LABEL \
maintainer="Tobias L. Maier <[email protected]>" \
org.label-schema.schema-version="1.0" \
org.label-schema.name="Errbit with Entrypoint script" \
org.label-schema.vcs-url="https://github.com/tmaier/errbit-helm"

USER root

COPY docker-entrypoint.sh /usr/local/bin/

USER errbit

CMD ["puma","-C","config/puma.default.rb"]
ENTRYPOINT ["docker-entrypoint.sh"]
2 changes: 1 addition & 1 deletion templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ data:
{{ $key | upper }}: {{ $value | b64enc | quote }}
{{- end }}
{{- if not .Values.mongodb.enabled }}
MONGODB_PASSWORD: {{- .Values.mongodbPassword | default "" | b64enc | quote -}}
MONGODB_PASSWORD: {{ .Values.mongodbPassword | default "" | b64enc | quote -}}
{{- end }}