Browse Source

Remove noninteractive flag from Dockerfile

This has been incorporated into the upstream image now.

Depends-On: https://review.opendev.org/738204
Change-Id: I9761bdf04c6e7b559e82ffd0d2c1accd62d86e46
changes/22/738122/2
Monty Taylor 2 weeks ago
parent
commit
cb5f4007a6
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      Dockerfile

+ 3
- 3
Dockerfile View File

@@ -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


Loading…
Cancel
Save