Skip to content

Terminate container when bootloader script fails #1639

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

Merged
merged 3 commits into from
Dec 1, 2020
Merged

Terminate container when bootloader script fails #1639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a0b4f
Terminate container when bootloader script fails
vishalbollu Nov 27, 2020
0a35599
Moved S6 flag to dockerfile
vishalbollu Nov 30, 2020
c989d1c
Merge branch 'master' into terminate-if-bootloader-fails
deliahu Dec 1, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved S6 flag to dockerfile
  • Loading branch information
@vishalbollu
vishalbollu committed Nov 30, 2020
commit 0a35599975f8c0acbd0d5fb53d88b05c53f85342
1 change: 0 additions & 1 deletion cli/local/docker_spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func getAPIEnv(api *spec.API, awsClient *aws.Client) []string {
"CORTEX_THREADS_PER_PROCESS="+s.Int32(api.Predictor.ThreadsPerProcess),
"CORTEX_MAX_REPLICA_CONCURRENCY="+s.Int32(api.Predictor.ProcessesPerReplica*api.Predictor.ThreadsPerProcess+1024), // allow a queue of 1024
"AWS_REGION="+awsClient.Region,
"S6_BEHAVIOUR_IF_STAGE2_FAILS="+"2",
)

if api.Predictor.ModelPath != nil || api.Predictor.Models != nil {
Expand Down
2 changes: 2 additions & 0 deletions images/onnx-predictor-cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN cd /tmp/ && \
cd - && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8

Expand Down
2 changes: 2 additions & 0 deletions images/onnx-predictor-gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN cd /tmp/ && \
cd - && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8

Expand Down
2 changes: 2 additions & 0 deletions images/python-predictor-cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN cd /tmp/ && \
cd - && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8

Expand Down
2 changes: 2 additions & 0 deletions images/python-predictor-gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN cd /tmp/ && \
cd - && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8

Expand Down
2 changes: 2 additions & 0 deletions images/python-predictor-inf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ RUN apt-get update -qq && apt-get install -y -q \
RUN wget -P /tmp/ https://github.com/just-containers/s6-overlay/releases/download/v2.1.0.2/s6-overlay-amd64-installer && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

ENV PATH=/opt/aws/neuron/bin/:$PATH

RUN apt-get update -qq && apt-get install -y -q \
Expand Down
2 changes: 2 additions & 0 deletions images/tensorflow-predictor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN cd /tmp/ && \
cd - && \
chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / && rm /tmp/s6-overlay-amd64-installer

ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2

RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US.en LC_ALL=en_US.UTF-8

Expand Down
4 changes: 0 additions & 4 deletions pkg/operator/operator/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,6 @@ func getEnvVars(api *spec.API, container string) []kcore.EnvVar {
Name: "CORTEX_PROJECT_DIR",
Value: path.Join(_emptyDirMountPath, "project"),
},
kcore.EnvVar{
Name: "S6_BEHAVIOUR_IF_STAGE2_FAILS",
Value: "2",
},
)

if api.Kind == userconfig.RealtimeAPIKind {
Expand Down
4 changes: 0 additions & 4 deletions pkg/workloads/cortex/serve/init/bootloader.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ fi
if [ -f "/mnt/project/dependencies.sh" ]; then
eval $source_env_file_cmd
bash -e /mnt/project/dependencies.sh
status=$?
if [ $status -ne 0 ]; then
exit $status
fi
fi

# install from conda-packages.txt
Expand Down