From 5361d64e993ddb9923e2bb32736f73af08d32fe0 Mon Sep 17 00:00:00 2001 From: Iain Sproat <68657+iainsproat@users.noreply.github.com> Date: Fri, 2 Jun 2023 16:33:26 +0100 Subject: [PATCH] Revert "fix(server helm / dockerfile): remove entrypoint from dockerfile (#1605)" (#1606) This reverts commit bcea709712d9159fa34f5da1d2ed4848a4d736d2. --- 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 a0a364712..b6fae0195 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -77,4 +77,5 @@ 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 -CMD ["node", "bin/www"] +ENTRYPOINT ["node"] +CMD ["bin/www"] diff --git a/utils/helm/speckle-server/templates/server/deployment.yml b/utils/helm/speckle-server/templates/server/deployment.yml index b8bcf3404..1af1e8c97 100644 --- a/utils/helm/speckle-server/templates/server/deployment.yml +++ b/utils/helm/speckle-server/templates/server/deployment.yml @@ -22,12 +22,11 @@ spec: - name: main image: speckle/speckle-server:{{ .Values.docker_image_tag }} imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.server.inspect.enabled }} args: #overwrites the Dockerfile CMD statement - - "node" + {{- if .Values.server.inspect.enabled }} - {{ printf "--inspect=%s" .Values.server.inspect.port }} - - "bin/www" {{- end }} + - "bin/www" ports: - name: http containerPort: {{ include "server.port" $ }}