Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Commit

Permalink
Remove CLI indirection (#2294)
Browse files Browse the repository at this point in the history
The docker iml cli had an extra layer of indirection where it would
source a profile before invoking the iml binary.

This may have been done prior to using .dotenv in the cli binary, but
it's no longer needed so we can remove all of it.

Signed-off-by: Joe Grund <jgrund@whamcloud.io>
  • Loading branch information
jgrund authored Oct 1, 2020
1 parent de206f7 commit ee0b513
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ services:
volumes:
- "manager-config:/var/lib/chroma"
environment:
- SERVER_HTTP_URL=gunicorn
- RUST_LOG=info
iml-ostpool:
image: "imlteam/iml-ostpool:6.2.0-dev"
Expand Down
6 changes: 1 addition & 5 deletions docker/iml-manager-cli.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,4 @@ FROM imlteam/rust-service-base:6.2.0-dev
COPY --from=builder /build/target/release/iml /usr/bin
COPY docker/wait-for-dependencies.sh /usr/local/bin

RUN echo -e "#! /usr/bin/env bash\n\
source /root/.profile && /usr/bin/iml \${@:1}\n\
" > /usr/local/bin/iml && chmod +x /usr/local/bin/iml

ENTRYPOINT wait-for-dependencies.sh && cat /var/lib/chroma/iml-settings.conf > ~/.profile && /bin/bash
ENTRYPOINT wait-for-dependencies.sh && /bin/bash

0 comments on commit ee0b513

Please sign in to comment.