From 79754dc1e9a345c331ceaa2b1523f1eeaf6f9c3f Mon Sep 17 00:00:00 2001 From: aterox Date: Sun, 13 Mar 2022 19:35:19 -0400 Subject: [PATCH] Revert Dockerfile, but ensure only one conf.yml --- Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2b0029f..8d7b15ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,18 +39,16 @@ WORKDIR ${DIRECTORY} RUN apk add --no-cache tzdata tini # Copy built application from build phase -COPY --from=BUILD_IMAGE /app/dist/ public/ -COPY --from=BUILD_IMAGE /app/node_modules/ node_modules/ -COPY services/ services/ -COPY src/utils/ src/utils/ -COPY package.json yarn.lock server.js ./ +COPY --from=BUILD_IMAGE /app ./ +# Ensure only one version of conf.yml exists +RUN rm dist/conf.yml # Finally, run start command to serve up the built application ENTRYPOINT [ "/sbin/tini", "--" ] -CMD [ "yarn", "start" ] +CMD [ "yarn", "build-and-start" ] # Expose the port EXPOSE ${PORT} # Run simple healthchecks every 5 mins, to check that everythings still great -HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check +HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check \ No newline at end of file