Skip to content

Commit

Permalink
fix(3062): use dumb-init instead of tini (#3090)
Browse files Browse the repository at this point in the history
  • Loading branch information
s-yoshika authored Apr 9, 2024
1 parent a39d1c2 commit 06a1c94
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ RUN ln -s /usr/src/app/node_modules/screwdriver-api/config /config
# Expose the web service port
EXPOSE 8080

# Add Tini
ENV TINI_VERSION v0.19.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]
# Add dumb-init
RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod +x /usr/local/bin/dumb-init
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]

# Run the service
CMD [ "node", "./bin/server" ]
7 changes: 6 additions & 1 deletion Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,10 @@ COPY . /usr/src/app
# Expose the web service port
EXPOSE 8080

# Add dumb-init
RUN wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
RUN chmod +x /usr/local/bin/dumb-init
ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]

# Run the service
CMD [ "npm", "start" ]
CMD [ "node", "./bin/server" ]

0 comments on commit 06a1c94

Please sign in to comment.