Skip to content

Commit

Permalink
Migrate before running
Browse files Browse the repository at this point in the history
  • Loading branch information
henrod committed Jun 14, 2017
1 parent a80ec9d commit ae114b3
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 40 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,7 @@ ENV MAESTRO_EXTENSIONS_PG_USER "maestro"
ENV MAESTRO_EXTENSIONS_PG_PASS "pass"
ENV PGPASSWORD "pass"

CMD if [ "$MAESTRO_RUN_SETUP" != "true" ]; then /app/maestro start; else sleep 10 && make assets && /app/maestro migrate -c /app/config/local.yaml; fi
CMD if [ "$MAESTRO_RUN_SETUP" == "true" ]; then \
make assets && /app/maestro migrate -c /app/config/local.yaml; \
fi && \
/app/maestro start;
2 changes: 1 addition & 1 deletion helm/charts/maestro-main/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: maestro-main
home: https://github.com/topfreegames/maestro
description: Maestro api and worker
version: 2.6.0
version: 2.6.1
maintainers:
- name: TFGCo
email: backend@tfgco.com
4 changes: 2 additions & 2 deletions helm/charts/maestro-main/templates/maestro-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ spec:
value: {{ .Values.postgres_user }}
- name: MAESTRO_EXTENSIONS_PG_PASS
value: {{ .Values.postgres_password }}
- name: PGPASSWORD
value: {{ .Values.postgres_password }}
- name: MAESTRO_RUN_SETUP
value: "true"
- name: MAESTRO_EXTENSIONS_PG_DATABASE
value: {{ .Values.postgres_database }}
- name: MAESTRO_GOOGLE_CLIENT_ID
Expand Down
34 changes: 0 additions & 34 deletions helm/charts/maestro-main/templates/maestro-db-config.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion helm/charts/maestro/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: maestro
home: https://github.com/topfreegames/maestro
description: Maestro
version: 0.1.11
version: 0.1.14
maintainers:
- name: TFGCo
email: backend@tfgco.com
2 changes: 1 addition & 1 deletion helm/charts/maestro/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ dependencies:
version: 0.1.0
repository: http://helm.tfgco.com
- name: maestro-main
version: 2.6.0
version: 2.6.1
repository: http://helm.tfgco.com

0 comments on commit ae114b3

Please sign in to comment.