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 'gitaly-ci' into 'master'

Browse source 
Add image with golang for use with gitlab-ce builds with gitaly

See merge request !31
This commit is contained in:
Kamil Trzciński 2017-04-04 07:57:46 +00:00
commit ce7d905fc1
8 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -31,6 +31,7 @@ ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3-static-analyses test: *test_build
www-gitlab-com test: *test_build
doc-gitlab-com test: *test_build
@ -45,6 +46,7 @@ ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3-static-analyses: *build_and_deploy
www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy

2
Dockerfile.golang-1.5-git-2.8.4
View file

@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
ADD . $PWD
RUN scripts/install-golang
RUN scripts/install-git
ENV PATH /usr/local/bin:$PATH

2
Dockerfile.golang-1.6-git-2.8.4
View file

@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
ADD . $PWD
RUN scripts/install-golang
RUN scripts/install-git
ENV PATH /usr/local/bin:$PATH

2
Dockerfile.golang-1.7-git-2.8.4
View file

@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
ADD . $PWD
RUN scripts/install-golang
RUN scripts/install-git
ENV PATH /usr/local/bin:$PATH

2
Dockerfile.golang-1.8-git-2.8.4
View file

@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
ADD . $PWD
RUN scripts/install-golang
RUN scripts/install-git
ENV PATH /usr/local/bin:$PATH

14
Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 Normal file
View file

@ -0,0 +1,14 @@
FROM ruby:2.3.3
ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1
RUN /scripts/install-node
RUN /scripts/install-golang
ENV PATH /usr/local/go/bin:$PATH
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

14
scripts/install-git Executable file
View file

@ -0,0 +1,14 @@
#!/bin/sh
mkdir build \
&& curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \
&& echo "$GIT_DOWNLOAD_SHA256 git.tar.gz" | sha256sum -c - \
&& tar -C build -xzf git.tar.gz \
&& cd build/git-$GIT_VERSION \
&& chmod +x configure \
&& ./configure \
&& make all \
&& make install PREFIX=/usr/local \
&& cd ../.. \
&& rm -rf build \
&& rm git.tar.gz

22
scripts/install-golang
View file

@ -1,14 +1,10 @@
#!/bin/sh
#!/bin/bash
mkdir build \
&& curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \
&& echo "$GIT_DOWNLOAD_SHA256 git.tar.gz" | sha256sum -c - \
&& tar -C build -xzf git.tar.gz \
&& cd build/git-$GIT_VERSION \
&& chmod +x configure \
&& ./configure \
&& make all \
&& make install PREFIX=/usr/local \
&& cd ../.. \
&& rm -rf build \
&& rm git.tar.gz
GOLANG_VERSION=${1:-1.8}
GOLANG_DOWNLOAD_URL="https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz"
GOLANG_DOWNLOAD_SHA256=${2:-53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca}
curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
&& tar -C /usr/local -xzf golang.tar.gz \
&& rm golang.tar.gz