diff options
| author | Shane McDonald <me@shanemcd.com> | 2021-04-02 20:16:51 +0200 |
|---|---|---|
| committer | Shane McDonald <me@shanemcd.com> | 2021-04-02 20:16:51 +0200 |
| commit | fccfef442c22a99ac2ac439b2dc6ed25bc2cfa0f (patch) | |
| tree | ac6bda8697e5fc917938e9ee5f671c4bd232038d /tools/ansible | |
| parent | Merge pull request #9737 from jlmitch5/workflowConvergence (diff) | |
| download | awx-fccfef442c22a99ac2ac439b2dc6ed25bc2cfa0f.tar.xz awx-fccfef442c22a99ac2ac439b2dc6ed25bc2cfa0f.zip | |
Make logs more readable in development environment
This uses https://github.com/coderanger/supervisor-stdout to prefix process
names before log messages in the dev env
Diffstat (limited to 'tools/ansible')
| -rw-r--r-- | tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index 617f4e9200..bbdcfadcf5 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -119,7 +119,7 @@ RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master RUN curl -L -o /usr/bin/tini https://github.com/krallin/tini/releases/download/v0.19.0/tini-{{ tini_architecture | default('amd64') }} && \ chmod +x /usr/bin/tini -RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" supervisor {% if build_dev|bool %}black{% endif %} +RUN python3.8 -m ensurepip && pip3 install "virtualenv < 20" supervisor RUN rm -rf /root/.cache && rm -rf /tmp/* @@ -153,6 +153,8 @@ RUN dnf -y install \ unzip && \ npm install -g n && n 14.15.1 && dnf remove -y nodejs +RUN pip3 install black git+https://github.com/coderanger/supervisor-stdout + # This package randomly fails to download. # It is nice to have in the dev env, but not necessary. # Add it back to the list above if the repo ever straighten up. |