[MediaWiki-commits] [Gerrit] operations/puppet[production]: docker::baseimages: improvements to script to build alpine l...
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330218 )
Change subject: docker::baseimages: improvements to script to build alpine linux
..
docker::baseimages: improvements to script to build alpine linux
Change-Id: Ifb5adc316f2e0a0cec8461ddfcc0d82ebd05dc5f
---
M modules/docker/templates/images/build-base-images.erb
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/docker/templates/images/build-base-images.erb
b/modules/docker/templates/images/build-base-images.erb
index e94afa2..05003b0 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -20,20 +20,26 @@
<%- end -%>
<%- if @distributions.include?('alpine') -%>
+<%- if @proxy_address -%>
+export https_proxy=http://<%= @proxy_address %>:<%= @proxy_port %>
+<%- end -%>
# 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_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 .)
+(cd $AP_DIR && git remote update && \
+ git checkout $AP_BRANCH)
# Now get the release tag from the repos own variables
source ${AP_DIR}/options
+(cd $AP_DIR && docker build . -t ${TAGS[0]})
for tag in $TAGS; do
+docker tag ${TAGS[0]} <%= @docker_registry %>/${tag};
docker push <%= @docker_registry %>/${tag};
done;
# This is the latest version, so...
-docker push <%= @docker_registry %>/alpine
+docker tag ${TAGS[0]} <%= @docker_registry %>/alpine:latest
+docker push <%= @docker_registry %>/alpine:latest
<%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/330218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb5adc316f2e0a0cec8461ddfcc0d82ebd05dc5f
Gerrit-PatchSet: 2
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: improvements to script to build alpine l...
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330218 )
Change subject: docker::baseimages: improvements to script to build alpine linux
..
docker::baseimages: improvements to script to build alpine linux
Change-Id: Ifb5adc316f2e0a0cec8461ddfcc0d82ebd05dc5f
---
M modules/docker/templates/images/build-base-images.erb
1 file changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/330218/1
diff --git a/modules/docker/templates/images/build-base-images.erb
b/modules/docker/templates/images/build-base-images.erb
index e94afa2..d772353 100755
--- a/modules/docker/templates/images/build-base-images.erb
+++ b/modules/docker/templates/images/build-base-images.erb
@@ -20,20 +20,25 @@
<%- end -%>
<%- if @distributions.include?('alpine') -%>
+<%- if @proxy_address -%>
+export https_proxy=http://<%= @proxy_address %>:<%= @proxy_port %>
+<%- end -%>
# 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_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 .)
+(cd $AP_DIR && git remote update && \
+ git checkout $AP_BRANCH)
# Now get the release tag from the repos own variables
source ${AP_DIR}/options
+(cd $AP_DIR && docker build . -t ${TAGS[0]})
for tag in $TAGS; do
+docker tag ${TAGS[0]} <%= @docker_registry %>/${tag};
docker push <%= @docker_registry %>/${tag};
done;
# This is the latest version, so...
-docker push <%= @docker_registry %>/alpine
-<%- end -%>
+docker tag ${TAGS[0]} <%= @docker_registry %>/alpine:latest
+docker push <%= @docker_registry %>/alpine:latest
--
To view, visit https://gerrit.wikimedia.org/r/330218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb5adc316f2e0a0cec8461ddfcc0d82ebd05dc5f
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
