diff options
| author | Monty Taylor <mordred@inaugust.com> | 2020-06-25 18:19:37 -0500 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2020-06-26 08:30:38 -0500 |
| commit | cb5f4007a68280e3ab760d92e111a04333a37dbb (patch) | |
| tree | 29041316b5373b619f21622dfab28e3735a1c146 /Dockerfile | |
| parent | eec7b303fb73335647282ce964fb38d7f8a0da83 (diff) | |
| download | zuul-cb5f4007a68280e3ab760d92e111a04333a37dbb.tar.gz | |
Remove noninteractive flag from Dockerfile
This has been incorporated into the upstream image now.
Depends-On: https://review.opendev.org/738204
Change-Id: I9761bdf04c6e7b559e82ffd0d2c1accd62d86e46
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 618d27e8c..378a76eb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,13 +27,13 @@ COPY . /tmp/src RUN /tmp/src/tools/install-js-tools.sh # Explicitly run the Javascript build RUN cd /tmp/src/web && yarn install -d && yarn build -RUN DEBIAN_FRONTEND=noninteractive assemble +RUN assemble # The wheel install method doesn't run the setup hooks as the source based # installations do so we have to call zuul-manage-ansible here. Remove # /root/.local/share/virtualenv after because it adds wheels into /root # that we don't need after the install step so are a waste of space. -RUN DEBIAN_FRONTEND=noninteractive /output/install-from-bindep && zuul-manage-ansible && rm -rf /root/.local/share/virtualenv +RUN /output/install-from-bindep && zuul-manage-ansible && rm -rf /root/.local/share/virtualenv RUN mkdir /tmp/openshift-install \ && curl -L $OPENSHIFT_URL -o /tmp/openshift-install/openshift-client.tgz \ @@ -44,7 +44,7 @@ RUN mkdir /tmp/openshift-install \ FROM docker.io/opendevorg/python-base:3.7 as zuul COPY --from=builder /output/ /output -RUN DEBIAN_FRONTEND=noninteractive /output/install-from-bindep \ +RUN /output/install-from-bindep \ && pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \ && rm -rf /output RUN useradd -u 10001 -m -d /var/lib/zuul -c "Zuul Daemon" zuul |