[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Add ruby images

2016-12-01 Thread Yuvipanda (Code Review)
Yuvipanda has submitted this change and it was merged.

Change subject: Add ruby images
..


Add ruby images

Bug: T141388
Change-Id: Ia7ed22e204bc772bf1a7dcf5ca671c1bd7850695
---
M build.py
A ruby/base/.dockerignore
A ruby/base/Dockerfile.template
A ruby/web/.dockerignore
A ruby/web/Dockerfile.template
5 files changed, 22 insertions(+), 1 deletion(-)

Approvals:
  Yuvipanda: Verified; Looks good to me, approved



diff --git a/build.py b/build.py
index 8da08d1..3960702 100755
--- a/build.py
+++ b/build.py
@@ -43,7 +43,10 @@
 ],
 'golang/base': [
 'golang/web',
-]
+],
+'ruby/base': [
+'ruby/web',
+],
 },
 'trusty-legacy': {}
 }
diff --git a/ruby/base/.dockerignore b/ruby/base/.dockerignore
new file mode 100644
index 000..689cf97
--- /dev/null
+++ b/ruby/base/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/ruby/base/Dockerfile.template b/ruby/base/Dockerfile.template
new file mode 100644
index 000..fb9bf61
--- /dev/null
+++ b/ruby/base/Dockerfile.template
@@ -0,0 +1,8 @@
+# Toollabs Ruby runtime image
+# Name: docker-registry.tools.wmflabs.org/toollabs-ruby
+FROM {registry}/{image_prefix}-base
+
+RUN apt-get install --yes \
+ruby \
+ruby-dev \
+build-essential
diff --git a/ruby/web/.dockerignore b/ruby/web/.dockerignore
new file mode 100644
index 000..689cf97
--- /dev/null
+++ b/ruby/web/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/ruby/web/Dockerfile.template b/ruby/web/Dockerfile.template
new file mode 100644
index 000..eb61747
--- /dev/null
+++ b/ruby/web/Dockerfile.template
@@ -0,0 +1,8 @@
+# Toollabs Ruby webserver image
+# Name: docker-registry.tools.wmflabs.org/toollabs-ruby-web
+FROM {registry}/{image_prefix}-ruby-base
+
+RUN apt-get install --yes \
+unicorn
+
+RUN apt-get install --yes toollabs-webservice

-- 
To view, visit https://gerrit.wikimedia.org/r/312033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7ed22e204bc772bf1a7dcf5ca671c1bd7850695
Gerrit-PatchSet: 2
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: MusikAnimal 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] operations...toollabs-images[master]: Add ruby images

2016-09-21 Thread BryanDavis (Code Review)
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312033

Change subject: Add ruby images
..

Add ruby images

Bug: T141388
Change-Id: Ia7ed22e204bc772bf1a7dcf5ca671c1bd7850695
---
M build.py
A ruby/base/.dockerignore
A ruby/base/Dockerfile.template
A ruby/web/.dockerignore
A ruby/web/Dockerfile.template
5 files changed, 22 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/docker-images/toollabs-images 
refs/changes/33/312033/1

diff --git a/build.py b/build.py
index 0ee1749..6e7f5c7 100755
--- a/build.py
+++ b/build.py
@@ -42,7 +42,10 @@
 ],
 'golang/base': [
 'golang/web',
-]
+],
+'ruby/base': [
+'ruby/web',
+],
 },
 }
 
diff --git a/ruby/base/.dockerignore b/ruby/base/.dockerignore
new file mode 100644
index 000..689cf97
--- /dev/null
+++ b/ruby/base/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/ruby/base/Dockerfile.template b/ruby/base/Dockerfile.template
new file mode 100644
index 000..fb9bf61
--- /dev/null
+++ b/ruby/base/Dockerfile.template
@@ -0,0 +1,8 @@
+# Toollabs Ruby runtime image
+# Name: docker-registry.tools.wmflabs.org/toollabs-ruby
+FROM {registry}/{image_prefix}-base
+
+RUN apt-get install --yes \
+ruby \
+ruby-dev \
+build-essential
diff --git a/ruby/web/.dockerignore b/ruby/web/.dockerignore
new file mode 100644
index 000..689cf97
--- /dev/null
+++ b/ruby/web/.dockerignore
@@ -0,0 +1 @@
+Dockerfile.template
diff --git a/ruby/web/Dockerfile.template b/ruby/web/Dockerfile.template
new file mode 100644
index 000..eb61747
--- /dev/null
+++ b/ruby/web/Dockerfile.template
@@ -0,0 +1,8 @@
+# Toollabs Ruby webserver image
+# Name: docker-registry.tools.wmflabs.org/toollabs-ruby-web
+FROM {registry}/{image_prefix}-ruby-base
+
+RUN apt-get install --yes \
+unicorn
+
+RUN apt-get install --yes toollabs-webservice

-- 
To view, visit https://gerrit.wikimedia.org/r/312033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7ed22e204bc772bf1a7dcf5ca671c1bd7850695
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits