NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'golang-1.9-images' into 'master'

Browse source 
Add Golang 1.9 Images

See merge request gitlab-org/gitlab-build-images!68
This commit is contained in:
Marin Jankovski 2017-12-15 21:30:02 +00:00
commit d8fb7dc5f2
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci.yml
View file

@ -47,11 +47,11 @@ before_script:
# Tests
ruby-2.3-golang-1.8-git-2.14 test: *test_custom
ruby-2.3-golang-1.8-git-2.8 test: *test_custom
ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.8-git-2.8.4 test: *test_custom
golang-1.8-git-2.14 test: *test_custom
ruby-2.3-golang-1.9-git-2.14 test: *test_custom
ruby-2.3-golang-1.9-git-2.8 test: *test_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.9-git-2.8.4 test: *test_custom
golang-1.9-git-2.14 test: *test_custom
node-8.9-chrome-63.0-yarn-1.2 test: *test_custom
www-gitlab-com test: *test_build
@ -67,11 +67,11 @@ omnibus-gitlab-xenial test: *test_build
# Builds
ruby-2.3-golang-1.8-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.8-git-2.8: *build_and_deploy_custom
ruby-2.3.5-golang-1.8-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.8-git-2.8.4: *build_and_deploy_custom
golang-1.8-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.8: *build_and_deploy_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.9-git-2.8.4: *build_and_deploy_custom
golang-1.9-git-2.14: *build_and_deploy_custom
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
www-gitlab-com: *build_and_deploy

10
scripts/custom-docker-build
View file

@ -4,12 +4,16 @@ set -e
IFS=$'\n\t'
function print_golang_args() {
GOLANG_VERSION=$1
case "$GOLANG_VERSION" in
case "$1" in
1.8)
GOLANG_VERSION=1.8
GOLANG_DOWNLOAD_SHA256=253ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
;;
1.9)
GOLANG_VERSION=1.9.2
GOLANG_DOWNLOAD_SHA256=de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
;;
*) echo "Unknown golang version $1"; exit 1;
esac
@ -22,7 +26,7 @@ function print_chrome_args() {
60|60.0) CHROME_VERSION=60.0.3112.90-1 ;;
61|61.0) CHROME_VERSION=61.0.3163.100-1 ;;
62|62.0) CHROME_VERSION=62.0.3202.89-1 ;;
63|63.0) CHROME_VERSION=63.0.3239.84-1 ;;
63|63.0) CHROME_VERSION=63.0.3239.108-1 ;;
*) echo "Unknown chrome version $1"; exit 1;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"