Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387587 )
Change subject: Use python-build images for build
......................................................................
Use python-build images for build
Change-Id: I8df9c1faf10091a5b35e762c0ad4140fb1828360
---
M Makefile.build
D dockerfiles/Dockerfile.jessie
D dockerfiles/Dockerfile.stretch
D dockerfiles/run.sh
4 files changed, 8 insertions(+), 59 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/docker-images/docker-pkg/deploy
refs/changes/87/387587/1
diff --git a/Makefile.build b/Makefile.build
index e377ffc..4e60b1e 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -17,38 +17,21 @@
cp $(JESSIE_ARTIFACTS) $(CURDIR)/artifacts/artifacts.jessie.tar.gz
cp $(STRETCH_ARTIFACTS) $(CURDIR)/artifacts/artifacts.stretch.tar.gz
-$(JESSIE_ARTIFACTS): docker-image-jessie.created
+$(JESSIE_ARTIFACTS):
+ docker pull docker-registry.wikimedia.org/python-build-jessie:latest
mkdir -p $(WHEELS_DIR)/jessie
docker run --rm -v $(CURDIR):/deploy:ro -v
$(WHEELS_DIR)/jessie:/wheels:rw -v /etc/group:/etc/group:ro \
- -v /etc/passwd:/etc/passwd:ro --user=$(UID)
jessie-wheels-builder:latest
+ -v /etc/passwd:/etc/passwd:ro --user=$(UID)
python-build-jessie:latest
-$(STRETCH_ARTIFACTS): docker-image-stretch.created
+$(STRETCH_ARTIFACTS):
+ docker pull docker-registry.wikimedia.org/python-build-stretch:latest
mkdir -p $(WHEELS_DIR)/stretch
docker run --rm -v $(CURDIR):/deploy:ro -v
$(WHEELS_DIR)/stretch:/wheels:rw -v /etc/group:/etc/group:ro \
- -v /etc/passwd:/etc/passwd:ro --user=$(UID)
stretch-wheels-builder:latest
+ -v /etc/passwd:/etc/passwd:ro --user=$(UID)
python-build-stretch:latest
# task clean[-DISTRO]
# clean docker artifacts for one distro, or all artifacts
-clean: clean.jessie clean.stretch
+clean:
- rm -rf $(WHEELS_DIR)
-clean.jessie:
- -rm docker-image-jessie.created
- -docker rmi jessie-wheels-builder:latest
-
-clean.stretch:
- -rm docker-image-stretch.created
- -docker rmi stretch-wheels-builder:latest
-
-# task docker-image-DISTRO.created
-# Create the docker image for building wheels
-docker-image-stretch.created:
- cd dockerfiles && docker build -t stretch-wheels-builder:latest -f
Dockerfile.stretch .
- touch docker-image-stretch.created
-
-docker-image-jessie.created:
- cd dockerfiles && docker build -t jessie-wheels-builder:latest -f
Dockerfile.jessie .
- touch docker-image-jessie.created
-
-
-.PHONY: artifacts all wheels clean clean.jessie clean.stretch
+.PHONY: artifacts all wheels clean
diff --git a/dockerfiles/Dockerfile.jessie b/dockerfiles/Dockerfile.jessie
deleted file mode 100644
index cae4d1e..0000000
--- a/dockerfiles/Dockerfile.jessie
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM docker-registry.wikimedia.org/wikimedia-jessie:latest
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
- apt-get -y --no-install-recommends install python3 python3-dev python3-pip
\
- python3-setuptools git \
- && apt-get clean && rm -rf /var/lib/apt/lists/* \
- && pip3 install --upgrade pip \
- && mkdir /wheels && pip3 install wheel
-
-COPY run.sh /bin/run.sh
-
-VOLUME ["/wheels", "/deploy"]
-
-CMD ["/bin/run.sh"]
diff --git a/dockerfiles/Dockerfile.stretch b/dockerfiles/Dockerfile.stretch
deleted file mode 100644
index 4f3b5fe..0000000
--- a/dockerfiles/Dockerfile.stretch
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM docker-registry.wikimedia.org/python3-devel:latest
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
- apt-get -y --no-install-recommends install python3-pip python3-setuptools \
- git \
- && apt-get clean && rm -rf /var/lib/apt/lists/* \
- && mkdir /wheels && pip3 install wheel
-
-COPY run.sh /bin/run.sh
-
-VOLUME ["/wheels", "/deploy"]
-
-CMD ["/bin/run.sh"]
diff --git a/dockerfiles/run.sh b/dockerfiles/run.sh
deleted file mode 100755
index 6bec650..0000000
--- a/dockerfiles/run.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -eu
-
-/usr/bin/pip3 wheel -r /deploy/frozen-requirements.txt -w /wheels
-(cp -ax /deploy /tmp/ && cd /tmp/deploy/src && python3 setup.py bdist_wheel)
-mv /tmp/deploy/src/dist/*.whl /wheels/
-(cd /wheels && tar -czvf artifacts.tar.gz ./*.whl)
--
To view, visit https://gerrit.wikimedia.org/r/387587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8df9c1faf10091a5b35e762c0ad4140fb1828360
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/docker-pkg/deploy
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
