[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker::baseimages: add support for alpine linux
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330206 )
Change subject: docker::baseimages: add support for alpine linux
..
docker::baseimages: add support for alpine linux
Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
---
M modules/docker/manifests/baseimages.pp
M modules/docker/templates/images/build-base-images.erb
2 files changed, 37 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/docker/manifests/baseimages.pp
b/modules/docker/manifests/baseimages.pp
index 5d576d1..bf84a22 100644
--- a/modules/docker/manifests/baseimages.pp
+++ b/modules/docker/manifests/baseimages.pp
@@ -47,7 +47,24 @@
owner => 'root',
group => 'root',
mode=> '0544',
-require => File['/srv/images/base']
+require => File['/srv/images/base'],
+}
+
+if 'alpine' in $distributions {
+if $proxy_address {
+$env = ["https_proxy=http://${proxy_address}:${proxy_port};]
+}
+else {
+$env = undef
+}
+
+exec { 'git clone alpine linux':
+command => '/usr/bin/git clone
https://github.com/gliderlabs/docker-alpine.git alpine',
+creates => '/srv/images/alpine',
+cwd => '/srv/images',
+environment => $env,
+require => File['/srv/images'],
+}
}
file { '/usr/local/bin/build-base-images':
diff --git a/modules/docker/templates/images/build-base-images.erb
b/modules/docker/templates/images/build-base-images.erb
index 07bf03d..e94afa2 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -18,3 +18,22 @@
# Push it to the repo
docker push <%= @docker_registry %>/wikimedia-trusty
<%- end -%>
+<%- if @distributions.include?('alpine') -%>
+
+# Build the latest alpine version
+(cd /srv/images/alpine && git checkout master && git pull --rebase)
+AP_BASE="/srv/images/alpine/versions"
+AP_VERSIONS=("${AP_BASE}/library-?.?")
+AP_DIR=${AP_VERSIONS[-1]}
+AP_BRANCH="rootfs/${AP_DIR#$AP_BASE}"
+
+(cd $ALPINE_DIR && git remote update && \
+ git checkout $AP_BRANCH && docker build .)
+# Now get the release tag from the repos own variables
+source ${AP_DIR}/options
+for tag in $TAGS; do
+docker push <%= @docker_registry %>/${tag};
+done;
+# This is the latest version, so...
+docker push <%= @docker_registry %>/alpine
+<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/330206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Giuseppe Lavagetto
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/puppet[production]: docker::baseimages: add support for alpine linux
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330206 )
Change subject: docker::baseimages: add support for alpine linux
..
docker::baseimages: add support for alpine linux
Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
---
M modules/docker/manifests/baseimages.pp
M modules/docker/templates/images/build-base-images.erb
2 files changed, 37 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/330206/1
diff --git a/modules/docker/manifests/baseimages.pp
b/modules/docker/manifests/baseimages.pp
index 5d576d1..bf84a22 100644
--- a/modules/docker/manifests/baseimages.pp
+++ b/modules/docker/manifests/baseimages.pp
@@ -47,7 +47,24 @@
owner => 'root',
group => 'root',
mode=> '0544',
-require => File['/srv/images/base']
+require => File['/srv/images/base'],
+}
+
+if 'alpine' in $distributions {
+if $proxy_address {
+$env = ["https_proxy=http://${proxy_address}:${proxy_port};]
+}
+else {
+$env = undef
+}
+
+exec { 'git clone alpine linux':
+command => '/usr/bin/git clone
https://github.com/gliderlabs/docker-alpine.git alpine',
+creates => '/srv/images/alpine',
+cwd => '/srv/images',
+environment => $env,
+require => File['/srv/images'],
+}
}
file { '/usr/local/bin/build-base-images':
diff --git a/modules/docker/templates/images/build-base-images.erb
b/modules/docker/templates/images/build-base-images.erb
index 07bf03d..e94afa2 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -18,3 +18,22 @@
# Push it to the repo
docker push <%= @docker_registry %>/wikimedia-trusty
<%- end -%>
+<%- if @distributions.include?('alpine') -%>
+
+# Build the latest alpine version
+(cd /srv/images/alpine && git checkout master && git pull --rebase)
+AP_BASE="/srv/images/alpine/versions"
+AP_VERSIONS=("${AP_BASE}/library-?.?")
+AP_DIR=${AP_VERSIONS[-1]}
+AP_BRANCH="rootfs/${AP_DIR#$AP_BASE}"
+
+(cd $ALPINE_DIR && git remote update && \
+ git checkout $AP_BRANCH && docker build .)
+# Now get the release tag from the repos own variables
+source ${AP_DIR}/options
+for tag in $TAGS; do
+docker push <%= @docker_registry %>/${tag};
+done;
+# This is the latest version, so...
+docker push <%= @docker_registry %>/alpine
+<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/330206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b440bcc97131110fe4a2f5c37182db93391bff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
