jenkins-bot has submitted this change and it was merged.
Change subject: Add golang images
......................................................................
Add golang images
Change-Id: Ibac3c81a434c9a8f426ec8e8e745d2f0d9396af8
---
M build.py
C golang/base/.dockerignore
A golang/base/Dockerfile.template
C golang/web/.dockerignore
A golang/web/Dockerfile.template
R jdk8/base/.dockerignore
R jdk8/base/Dockerfile.template
R jdk8/web/.dockerignore
R jdk8/web/Dockerfile.template
9 files changed, 17 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build.py b/build.py
index 3cebbcc..39f1484 100755
--- a/build.py
+++ b/build.py
@@ -23,8 +23,8 @@
'php/base': [
'php/web',
],
- 'java/base': [
- 'java/web',
+ 'jdk8/base': [
+ 'jdk8/web',
],
'static-web': [],
'nodejs/base': [
@@ -36,6 +36,9 @@
# Python refers to python3, because it is 2016!
'python/base': [
'python/web',
+ ],
+ 'golang/base': [
+ 'golang/web',
]
},
}
diff --git a/java/base/.dockerignore b/golang/base/.dockerignore
similarity index 100%
copy from java/base/.dockerignore
copy to golang/base/.dockerignore
diff --git a/golang/base/Dockerfile.template b/golang/base/Dockerfile.template
new file mode 100644
index 0000000..58ac034
--- /dev/null
+++ b/golang/base/Dockerfile.template
@@ -0,0 +1,5 @@
+# Toollabs Golang runtime image
+# Name: docker-registry.tools.wmflabs.org/toollabs-golang
+FROM {registry}/{image_prefix}-base
+
+RUN apt-get install --yes -t jessie-backports golang-go
diff --git a/java/web/.dockerignore b/golang/web/.dockerignore
similarity index 100%
copy from java/web/.dockerignore
copy to golang/web/.dockerignore
diff --git a/golang/web/Dockerfile.template b/golang/web/Dockerfile.template
new file mode 100644
index 0000000..dc9cea0
--- /dev/null
+++ b/golang/web/Dockerfile.template
@@ -0,0 +1,5 @@
+# Toollabs golang webserver image
+# Name: docker-registry.tools.wmflabs.org/toollabs-golang-web
+FROM {registry}/{image_prefix}-golang-base
+
+RUN apt-get install --yes toollabs-webservice
diff --git a/java/base/.dockerignore b/jdk8/base/.dockerignore
similarity index 100%
rename from java/base/.dockerignore
rename to jdk8/base/.dockerignore
diff --git a/java/base/Dockerfile.template b/jdk8/base/Dockerfile.template
similarity index 70%
rename from java/base/Dockerfile.template
rename to jdk8/base/Dockerfile.template
index 6a93891..e8588d6 100644
--- a/java/base/Dockerfile.template
+++ b/jdk8/base/Dockerfile.template
@@ -1,5 +1,5 @@
# Toollabs Java runtime image
-# Name: docker-registry.tools.wmflabs.org/toollabs-java
+# Name: docker-registry.tools.wmflabs.org/toollabs-jdk8
FROM {registry}/{image_prefix}-base
RUN apt-get install --yes -t jessie-backports \
diff --git a/java/web/.dockerignore b/jdk8/web/.dockerignore
similarity index 100%
rename from java/web/.dockerignore
rename to jdk8/web/.dockerignore
diff --git a/java/web/Dockerfile.template b/jdk8/web/Dockerfile.template
similarity index 77%
rename from java/web/Dockerfile.template
rename to jdk8/web/Dockerfile.template
index 1ede3eb..19fe751 100644
--- a/java/web/Dockerfile.template
+++ b/jdk8/web/Dockerfile.template
@@ -1,5 +1,5 @@
# Toollabs Java webserver image
# Name: docker-registry.tools.wmflabs.org/toollabs-java-web
-FROM {registry}/{image_prefix}-java-base
+FROM {registry}/{image_prefix}-jdk8-base
RUN apt-get install --yes toollabs-webservice
--
To view, visit https://gerrit.wikimedia.org/r/300800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibac3c81a434c9a8f426ec8e8e745d2f0d9396af8
Gerrit-PatchSet: 4
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
