Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380940 )
Change subject: (WIP) dockerfiles: migrate some images to ci-jessie
......................................................................
(WIP) dockerfiles: migrate some images to ci-jessie
Change-Id: I109ddd323e00b94bc945e05777837ddd31237356
---
M dockerfiles/lintr/Dockerfile
M dockerfiles/php/Dockerfile
M dockerfiles/tox/Dockerfile
3 files changed, 15 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/40/380940/1
diff --git a/dockerfiles/lintr/Dockerfile b/dockerfiles/lintr/Dockerfile
index b6f1ae8..233d024 100644
--- a/dockerfiles/lintr/Dockerfile
+++ b/dockerfiles/lintr/Dockerfile
@@ -1,20 +1,15 @@
-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
@@ -23,4 +18,4 @@
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/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: newchange
Gerrit-Change-Id: I109ddd323e00b94bc945e05777837ddd31237356
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
