diff options
| author | kvahuja <k.v.ahuja@gmail.com> | 2017-02-14 19:19:49 +0530 |
|---|---|---|
| committer | kvahuja <k.v.ahuja@gmail.com> | 2017-02-14 19:19:49 +0530 |
| commit | cfbe20fe0842e3e05eae184232469f0e6f6441f2 (patch) | |
| tree | c19c8c0ee8e8358d49f749105f7fa71a208f5636 | |
| parent | e84f2fb1c3c1155f777e44c0e470c57bcb02b068 (diff) | |
| download | vaindock-cfbe20fe0842e3e05eae184232469f0e6f6441f2.tar.gz vaindock-cfbe20fe0842e3e05eae184232469f0e6f6441f2.zip | |
naming fix + entry point fix for workspace shell
1. renamed processor container to more usable
2. fixed for shell entry point for user
| -rw-r--r-- | docker-compose.yml | 3 | ||||
| -rw-r--r-- | workspace/Dockerfile | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index bac987a..bc35302 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -116,8 +116,7 @@ services: ### Python Container for processor - vaindock_python_processor: - container_name: vaindock_python_processor + processor: build: ./python volumes: - ../processor:/apps/api diff --git a/workspace/Dockerfile b/workspace/Dockerfile index c82eedf..3d31dce 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -112,13 +112,17 @@ COPY ./aliases.sh /home/laradock/aliases.sh RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc + echo "" >> ~/.bashrc && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh USER root RUN echo "" >> ~/.bashrc && \ echo "# Load Custom Aliases" >> ~/.bashrc && \ echo "source /home/laradock/aliases.sh" >> ~/.bashrc && \ - echo "" >> ~/.bashrc + echo "" >> ~/.bashrc && \ + sed -i 's/\r//' /home/laradock/aliases.sh && \ + sed -i 's/^#! \/bin\/sh/#! \/bin\/bash/' /home/laradock/aliases.sh ##################################### # xDebug: |