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

Add images with git 2.14.3

Browse source
This commit is contained in:
Balasankar C 2017-12-13 20:22:57 +00:00 • committed by Marin Jankovski
parent 3e37e4ffd0
commit d5c225c148
3 changed files with 15 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/custom-docker-build
View file

@ -22,6 +22,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 ;;
*) echo "Unknown chrome version $1"; exit 1;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
@ -42,6 +43,10 @@ function print_git_args() {
GIT_VERSION=2.13.6
GIT_DOWNLOAD_SHA256=cb53e6b388d8d19189933366c1fe5c1ca500e8b227b9e707af39c3d879e41015
;;
2.14)
GIT_VERSION=2.14.3
GIT_DOWNLOAD_SHA256=023ffff6d3ba8a1bea779dfecc0ed0bb4ad68ab8601d14435dd8c08416f78d7f
;;
*) echo "Unknown git version $1"; exit 1;
esac
@ -49,14 +54,6 @@ function print_git_args() {
printf -- "--build-arg GIT_DOWNLOAD_SHA256=%s " "$GIT_DOWNLOAD_SHA256"
}
function print_phantomjs_args() {
case "$1" in
2.1) PHANTOMJS_VERSION=2.1.1 ;;
*) echo "Unknown phantomjs version $1"; exit 1;
esac
printf -- "--build-arg PHANTOMJS_VERSION=%s " "$PHANTOMJS_VERSION"
}
function print_node_args() {
case "$1" in
7.x|7.1) NODE_INSTALL_VERSION=7.x ;;
@ -91,7 +88,6 @@ function parse_arguments() {
golang) print_golang_args $version ;;
chrome) print_chrome_args $version ;;
git) print_git_args $version ;;
phantomjs) print_phantomjs_args $version ;;
node) print_node_args $version ;;
yarn) print_yarn_args $version ;;
postgresql) print_postgres_args $version ;;

11
scripts/install-phantomjs
View file

@ -1,11 +0,0 @@
#!/bin/bash
set -xeo pipefail
cd /tmp
PHANTOMJS_VERSION=${1:-1.9.8}
PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64"
curl -L "https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOMJS_FILE.tar.bz2" | tar jx
cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/"
rm -rf /tmp/*