Merge branch 'master' into trace-automations

charts/budibase/templates/app-service-deployment.yaml

@@ -244,4 +244,12 @@ spec:
       {{ end }}
       restartPolicy: Always
       serviceAccountName: ""
+      {{ if .Values.services.apps.command }}
+      command:
+      {{- toYaml .Values.services.apps.command | nindent 8 }}
+      {{ end }}
+      {{ if .Values.services.apps.args }}
+      args:
+      {{- toYaml .Values.services.apps.args | nindent 8 }}
+      {{ end }}
 status: {}

charts/budibase/templates/automation-worker-service-deployment.yaml

@@ -244,5 +244,13 @@ spec:
       {{ end }}
       restartPolicy: Always
       serviceAccountName: ""
+      {{ if .Values.services.automationWorkers.command }}}
+      command:
+      {{- toYaml .Values.services.automationWorkers.command | nindent 8 }}
+      {{ end }}
+      {{ if .Values.services.automationWorkers.args }}
+      args:
+      {{- toYaml .Values.services.automationWorkers.args | nindent 8 }}
+      {{ end }}
 status: {}
 {{- end }}

charts/budibase/templates/proxy-service-deployment.yaml

@@ -100,5 +100,13 @@ spec:
       {{ end }}
       restartPolicy: Always
       serviceAccountName: ""
+      {{ if .Values.services.proxy.command }}
+      command:
+      {{- toYaml .Values.services.proxy.command | nindent 8 }}
+      {{ end }}
+      {{ if .Values.services.proxy.args }}
+      args:
+      {{- toYaml .Values.services.proxy.args | nindent 8 }}
+      {{ end }}
       volumes:
 status: {}

charts/budibase/templates/worker-service-deployment.yaml

@@ -230,4 +230,12 @@ spec:
       {{ end }}
       restartPolicy: Always
       serviceAccountName: ""
+      {{ if .Values.services.worker.command }}
+      command:
+      {{- toYaml .Values.services.worker.command | nindent 8 }}
+      {{ end }}
+      {{ if .Values.services.worker.args }}
+      args:
+      {{- toYaml .Values.services.worker.args | nindent 8 }}
+      {{ end }}
 status: {}

hosting/single/runner.sh

@@ -7,7 +7,7 @@ declare -a DOCKER_VARS=("APP_PORT" "APPS_URL" "ARCHITECTURE" "BUDIBASE_ENVIRONME
 [[ -z "${BUDIBASE_ENVIRONMENT}" ]] && export BUDIBASE_ENVIRONMENT=PRODUCTION
 [[ -z "${CLUSTER_PORT}" ]] && export CLUSTER_PORT=80
 [[ -z "${DEPLOYMENT_ENVIRONMENT}" ]] && export DEPLOYMENT_ENVIRONMENT=docker
-[[ -z "${MINIO_URL}" ]] && export MINIO_URL=http://127.0.0.1:9000
+[[ -z "${MINIO_URL}" ]] && [[ -z "${USE_S3}" ]] && export MINIO_URL=http://127.0.0.1:9000
 [[ -z "${NODE_ENV}" ]] && export NODE_ENV=production
 [[ -z "${POSTHOG_TOKEN}" ]] && export POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
 [[ -z "${TENANT_FEATURE_FLAGS}" ]] && export TENANT_FEATURE_FLAGS="*:LICENSING,*:USER_GROUPS,*:ONBOARDING_TOUR"
@@ -77,7 +77,12 @@ mkdir -p ${DATA_DIR}/minio
 chown -R couchdb:couchdb ${DATA_DIR}/couch
 redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 &
 /bbcouch-runner.sh &
-/minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 &
+
+# only start minio if use s3 isn't passed
+if [[ -z "${USE_S3}"]]; then
+  /minio/minio server --console-address ":9001" ${DATA_DIR}/minio > /dev/stdout 2>&1 &
+fi
+
 /etc/init.d/nginx restart
 if [[ ! -z "${CUSTOM_DOMAIN}" ]]; then
     # Add monthly cron job to renew certbot certificate

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.13.47",
+  "version": "2.13.48",
   "npmClient": "yarn",
   "packages": [
     "packages/*",