Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

preview: Use dumb-init as PID 1 #2982

Merged
merged 1 commit into from
Apr 15, 2024
Merged

preview: Use dumb-init as PID 1 #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ RUN install_packages \
# Used both to install dependencies and at run time
bash less \
# Just in case you have to shell into the image
locales
locales \
# Deal with utf-8 characters properly
dumb-init
# Reap zombie git gc processes
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
Expand Down
1 change: 1 addition & 0 deletions preview/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ COPY preview /docs_build/preview
COPY template /docs_build/template
COPY resources /docs_build/resources

ENTRYPOINT ["dumb-init", "--"]
CMD ["/docs_build/build_docs.pl", "--in_standard_docker", "--preview"]
2 changes: 1 addition & 1 deletion preview/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set -eo pipefail

export IMAGE=docker.elastic.co/docs/preview
export VERSION=17
export VERSION=18

cd $(git rev-parse --show-toplevel)
./build_docs --docker-build build
Expand Down