diff --git a/Dockerfile b/Dockerfile index 7bdfc659..c15569b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,43 +1,43 @@ -FROM debian:stretch +FROM docker-registry.wikimedia.org/wikimedia-stretch ENV LANG C.UTF-8 -COPY files/backports.list /etc/apt/sources.list.d/backports.list -RUN apt-get update && apt-get install -y nodejs -t stretch-backports && \ - apt-get install -y composer git ssh \ +COPY files/node10.list /etc/apt/sources.list.d/node10.list +RUN apt-get update && \ + apt-get install -y composer nodejs git ssh \ ruby ruby2.3 ruby2.3-dev rubygems-integration \ python build-essential pkg-config \ php-ast php-xml php-zip php-gd php-gmp php-mbstring php-curl \ python3 python3-dev python3-pip python3-virtualenv \ --no-install-recommends && rm -rf /var/lib/apt/lists/* RUN git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/npm.git /srv/npm \ && rm -rf /srv/npm/.git \ && ln -s /srv/npm/bin/npm-cli.js /usr/bin/npm # TODO move grr into venv RUN pip3 install grr RUN gem install --no-rdoc --no-ri jsduck RUN install --owner=nobody --group=nogroup --directory /venv # Some tooling (e.g. git config) is easier if we have a home dir. RUN install --owner=nobody --group=nogroup --directory /nonexistent USER nobody COPY files/known_hosts /nonexistent/.ssh/known_hosts ENV PIPENV_VENV_IN_PROJECT 1 ENV PYTHONUNBUFFERED 1 RUN python3 -m virtualenv -p python3 /venv # TODO use package for pipenv in buster RUN /venv/bin/pip install pipenv RUN mkdir -p /venv/src/ COPY Pipfile /venv/src/ COPY Pipfile.lock /venv/src/ RUN cd /venv/src && /venv/bin/pipenv install --deploy COPY setup.py /venv/src/ COPY ./libup /venv/src/libup RUN cd /venv/src && /venv/bin/pipenv run python setup.py install ENV COMPOSER_PROCESS_TIMEOUT 1800 # Shared cache ENV NPM_CONFIG_CACHE=/cache ENV XDG_CACHE_HOME=/cache COPY ./libup /venv/src WORKDIR /venv/src ENTRYPOINT ["/venv/bin/pipenv", "run"] CMD ["libup-ng"] diff --git a/files/backports.list b/files/backports.list deleted file mode 100644 index 8d181639..00000000 --- a/files/backports.list +++ /dev/null @@ -1 +0,0 @@ -deb http://mirrors.wikimedia.org/debian stretch-backports main diff --git a/files/node10.list b/files/node10.list new file mode 100644 index 00000000..dedf4e2e --- /dev/null +++ b/files/node10.list @@ -0,0 +1 @@ +deb http://apt.wikimedia.org/wikimedia stretch-wikimedia component/node10