jenkins-bot has submitted this change and it was merged.
Change subject: Add python (aka python3) images
......................................................................
Add python (aka python3) images
Change-Id: I85c089bf14ede5b862c140d058c4f81b74df6ee1
---
M build.py
A python/base/.dockerignore
A python/base/Dockerfile.template
A python/web/.dockerignore
A python/web/Dockerfile.template
5 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build.py b/build.py
index e11cd02..3cebbcc 100755
--- a/build.py
+++ b/build.py
@@ -33,6 +33,10 @@
'python2/base': [
'python2/web',
],
+ # Python refers to python3, because it is 2016!
+ 'python/base': [
+ 'python/web',
+ ]
},
}
diff --git a/python/base/.dockerignore b/python/base/.dockerignore
new file mode 100644
index 0000000..689cf97
--- /dev/null
+++ b/python/base/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/python/base/Dockerfile.template b/python/base/Dockerfile.template
new file mode 100644
index 0000000..39d3731
--- /dev/null
+++ b/python/base/Dockerfile.template
@@ -0,0 +1,9 @@
+# Toollabs Python3 runtime image
+# Name: docker-registry.tools.wmflabs.org/toollabs-python
+FROM {registry}/{image_prefix}-base
+
+RUN apt-get install --yes \
+ python3 \
+ python3-dev \
+ build-essential \
+ python3-virtualenv
diff --git a/python/web/.dockerignore b/python/web/.dockerignore
new file mode 100644
index 0000000..689cf97
--- /dev/null
+++ b/python/web/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/python/web/Dockerfile.template b/python/web/Dockerfile.template
new file mode 100644
index 0000000..aec09ee
--- /dev/null
+++ b/python/web/Dockerfile.template
@@ -0,0 +1,9 @@
+# Toollabs Python3 webserver image
+# Name: docker-registry.tools.wmflabs.org/toollabs-python-web
+FROM {registry}/{image_prefix}-python-base
+
+RUN apt-get install --yes \
+ uwsgi \
+ uwsgi-plugin-python3
+
+RUN apt-get install --yes toollabs-webservice
--
To view, visit https://gerrit.wikimedia.org/r/298557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85c089bf14ede5b862c140d058c4f81b74df6ee1
Gerrit-PatchSet: 2
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
