From bcea709712d9159fa34f5da1d2ed4848a4d736d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= <57442769+gjedlicska@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:01:01 +0200 Subject: [PATCH] fix(server helm / dockerfile): remove entrypoint from dockerfile (#1605) the server helm deployment only overrides if inspect is needed --- packages/server/Dockerfile | 3 +-- utils/helm/speckle-server/templates/server/deployment.yml | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index b6fae0195..a0a364712 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -77,5 +77,4 @@ COPY --from=build-stage /speckle-server/packages/server/dist ./dist COPY --from=build-stage /speckle-server/packages/server/assets ./assets COPY --from=build-stage /speckle-server/packages/server/bin ./bin -ENTRYPOINT ["node"] -CMD ["bin/www"] +CMD ["node", "bin/www"] diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml index 1af1e8c97..b8bcf3404 100644 --- a/utils/helm/speckle-server/templates/server/deployment.yml +++ b/utils/helm/speckle-server/templates/server/deployment.yml @@ -22,11 +22,12 @@ spec: - name: main image: speckle/speckle-server:{{ .Values.docker_image_tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} - args: #overwrites the Dockerfile CMD statement {{- if .Values.server.inspect.enabled }} + args: #overwrites the Dockerfile CMD statement + - "node" - {{ printf "--inspect=%s" .Values.server.inspect.port }} - {{- end }} - "bin/www" + {{- end }} ports: - name: http containerPort: {{ include "server.port" $ }}