Skip to content

Commit

Permalink
Merge pull request #1067 from govuk-one-login/OJ-2870-update-docker-file
Browse files Browse the repository at this point in the history 
OJ-2870: Update docker file
  • Loading branch information
@jkunle
jkunle authored Jan 16, 2025
2 parents 9137f14 + 112e1c1 commit db99835
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ RUN yarn install --production --frozen-lockfile

FROM node:20.11.1-alpine3.19@sha256:f4c96a28c0b2d8981664e03f461c2677152cd9a756012ffa8e2c6727427c2bda AS final

RUN ["apk", "--no-cache", "upgrade"]
RUN ["apk", "add", "--no-cache", "tini"]
RUN apk --no-cache upgrade \
&& apk add --no-cache tini \
&& apk add --no-cache curl

RUN [ "yarn", "set", "version", "1.22.17" ]

WORKDIR /app
Expand All @@ -35,9 +37,9 @@ COPY --from=builder /app/yarn.lock ./

# Add in dynatrace layer
COPY --from=khw46367.live.dynatrace.com/linux/oneagent-codemodules-musl:nodejs / /
ENV LD_PRELOAD /opt/dynatrace/oneagent/agent/lib64/liboneagentproc.so
ENV LD_PRELOAD=/opt/dynatrace/oneagent/agent/lib64/liboneagentproc.so

ENV PORT 8080
ENV PORT=8080
EXPOSE $PORT

HEALTHCHECK --interval=10s --timeout=2s --start-period=5s --retries=3 \
Expand Down
4 changes: 2 additions & 2 deletions dev.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ COPY --from=builder /app/yarn.lock ./

# Add in dynatrace layer
COPY --from=khw46367.live.dynatrace.com/linux/oneagent-codemodules-musl:nodejs / /
ENV LD_PRELOAD /opt/dynatrace/oneagent/agent/lib64/liboneagentproc.so
ENV LD_PRELOAD=/opt/dynatrace/oneagent/agent/lib64/liboneagentproc.so

ENV PORT 8080
ENV PORT=8080
EXPOSE $PORT

HEALTHCHECK --interval=10s --timeout=2s --start-period=5s --retries=3 \
Expand Down

0 comments on commit db99835

Please sign in to comment.