jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/380940 )
Change subject: dockerfiles: migrate some images to ci-jessie ...................................................................... dockerfiles: migrate some images to ci-jessie Change-Id: I109ddd323e00b94bc945e05777837ddd31237356 --- M dockerfiles/composer/Dockerfile M dockerfiles/lintr/Dockerfile M dockerfiles/mediawiki-phan/Dockerfile M dockerfiles/php-mediawiki/Dockerfile M dockerfiles/php/Dockerfile M dockerfiles/tox/Dockerfile 6 files changed, 20 insertions(+), 52 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile index 10be3b3..cebac5e 100644 --- a/dockerfiles/composer/Dockerfile +++ b/dockerfiles/composer/Dockerfile @@ -4,16 +4,8 @@ COPY .cache-buster-composer /.cache-buster-composer -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ - git \ - ca-certificates && \ - git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \ - rm -rf /srv/composer/.git && \ - apt-get remove --yes \ - git \ - ca-certificates && \ - apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \ + rm -rf /srv/composer/.git RUN groupadd -r composer && useradd --no-log-init -r -g composer composer diff --git a/dockerfiles/lintr/Dockerfile b/dockerfiles/lintr/Dockerfile index b6f1ae8..10e2bac 100644 --- a/dockerfiles/lintr/Dockerfile +++ b/dockerfiles/lintr/Dockerfile @@ -1,26 +1,19 @@ -FROM docker-registry.wikimedia.org/wikimedia-jessie:latest +FROM wmfreleng/ci-jessie:latest RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ + apt-get install --yes --no-install-recommends \ # The r language itself r-base \ # Needed to build lintr - make gcc g++ ca-certificates gfortran liblapack-dev libxml2-dev libssl-dev libcurl4-openssl-dev \ + make gcc g++ gfortran liblapack-dev libxml2-dev libssl-dev libcurl4-openssl-dev \ && \ Rscript -e 'install.packages("devtools", repos="http://cran.rstudio.com/";)' && \ Rscript -e 'devtools::install_github("jimhester/[email protected]")' && \ apt-get remove --yes make gcc g++ gfortran liblapack-dev libssl-dev libcurl4-openssl-dev && \ apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* -# TODO git & ca-certificates should probably be in some base CI image... -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends git && \ - apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* - -RUN mkdir -m 777 /log && mkdir -m 777 /src - USER nobody WORKDIR /src ENTRYPOINT /bin/bash /run.sh COPY run.sh /run.sh -COPY lint.R /lint.R \ No newline at end of file +COPY lint.R /lint.R diff --git a/dockerfiles/mediawiki-phan/Dockerfile b/dockerfiles/mediawiki-phan/Dockerfile index 2ed9b60..cba34ea 100644 --- a/dockerfiles/mediawiki-phan/Dockerfile +++ b/dockerfiles/mediawiki-phan/Dockerfile @@ -6,11 +6,6 @@ COPY --from=composer /srv/composer /srv/composer -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ - ca-certificates && \ - apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* - RUN groupadd -r phan && \ useradd --no-log-init --system --create-home -g phan phan && \ install -d /srv/phan -o phan -g phan diff --git a/dockerfiles/php-mediawiki/Dockerfile b/dockerfiles/php-mediawiki/Dockerfile index 4d03716..7fbf8d3 100644 --- a/dockerfiles/php-mediawiki/Dockerfile +++ b/dockerfiles/php-mediawiki/Dockerfile @@ -3,9 +3,9 @@ USER root RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ + apt-get install --yes --no-install-recommends \ # Required by sury per https://packages.sury.org/php/README.txt - apt-transport-https lsb-release ca-certificates && \ + apt-transport-https lsb-release && \ echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \ # Only update the source we have added to save time apt-get update -o Dir::Etc::sourcelist="sources.list.d/php.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" && \ @@ -15,7 +15,7 @@ # Needed for mediawiki php-ast php7.0-mbstring php7.0-xml && \ apt-get remove --yes --purge \ - apt-transport-https lsb-release ca-certificates && \ + apt-transport-https lsb-release && \ apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* && \ rm /etc/apt/sources.list.d/php.list diff --git a/dockerfiles/php/Dockerfile b/dockerfiles/php/Dockerfile index 6b4523f..08f7e2e 100644 --- a/dockerfiles/php/Dockerfile +++ b/dockerfiles/php/Dockerfile @@ -1,18 +1,18 @@ -FROM docker-registry.wikimedia.org/wikimedia-jessie:latest +FROM wmfreleng/ci-jessie:latest COPY sury-php.gpg /etc/apt/trusted.gpg.d/php.gpg RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ + apt-get install --yes --no-install-recommends \ # Required by sury per https://packages.sury.org/php/README.txt - apt-transport-https lsb-release ca-certificates && \ + apt-transport-https lsb-release && \ echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \ # Only update the source we have added to save time apt-get update -o Dir::Etc::sourcelist="sources.list.d/php.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ + apt-get install --yes --no-install-recommends \ php7.0-cli && \ apt-get remove --yes \ - apt-transport-https lsb-release ca-certificates && \ + apt-transport-https lsb-release && \ apt-get autoremove --yes && apt-get clean && rm -rf /var/lib/apt/lists/* && \ rm /etc/apt/sources.list.d/php.list @@ -21,4 +21,4 @@ USER php ENTRYPOINT ["php"] -CMD ["--help"] \ No newline at end of file +CMD ["--help"] diff --git a/dockerfiles/tox/Dockerfile b/dockerfiles/tox/Dockerfile index 218f907..ff5da53 100644 --- a/dockerfiles/tox/Dockerfile +++ b/dockerfiles/tox/Dockerfile @@ -1,13 +1,11 @@ -FROM docker-registry.wikimedia.org/wikimedia-jessie:latest +FROM wmfreleng/ci-jessie:latest RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ - git \ - ca-certificates \ + apt-get install --yes --no-install-recommends \ python-pip \ pypy \ && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* ARG PIP_DISABLE_PIP_VERSION_CHECK=1 @@ -17,17 +15,7 @@ pip install tox==2.5.0 && \ pip install setuptools -RUN groupadd -g 500 wikidev && \ - # This is the uid and gid of the jenkins-deploy user for CI - useradd -u 2947 -g 500 \ - --home-dir /var/lib/jenkins \ - --create-home jenkins && \ - mkdir /var/lib/jenkins/log && \ - mkdir /srv/src && \ - chown -R 2947:500 /var/lib/jenkins/log && \ - chown -R 2947:500 /srv/src - -USER jenkins -WORKDIR /var/lib/jenkins +USER nobody +WORKDIR /src ENTRYPOINT /bin/bash /run.sh COPY run.sh /run.sh -- To view, visit https://gerrit.wikimedia.org/r/380940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I109ddd323e00b94bc945e05777837ddd31237356 Gerrit-PatchSet: 4 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Addshore <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
