Skip to content

Commit

Permalink
build: updating tini init command in direct mount toolbox
Browse files Browse the repository at this point in the history
the tini have been removed but was still present at direct mount
used the bin/bash shell in place of tini

Closes: #9382
Signed-off-by: parth-gr <paarora@redhat.com>
(cherry picked from commit bd3e558)

# Conflicts:
#	deploy/examples/direct-mount.yaml
  • Loading branch information
parth-gr authored and mergify-bot committed Dec 14, 2021
1 parent 9dbcd2f commit dbe0346
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions deploy/examples/direct-mount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
containers:
- name: rook-direct-mount
<<<<<<< HEAD
image: rook/ceph:v1.8.0
command: ["/tini"]
args: ["-g", "--", "/usr/local/bin/toolbox.sh"]
=======
image: rook/ceph:master
command: ["/bin/bash"]
args: ["-m", "-c", "/usr/local/bin/toolbox.sh"]
>>>>>>> bd3e558c2 (build: updating tini init command in direct mount toolbox)
imagePullPolicy: IfNotPresent
tty: true
env:
- name: ROOK_CEPH_USERNAME
valueFrom:
Expand Down

0 comments on commit dbe0346

Please sign in to comment.