mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 18:12:55 +01:00
Add image with golang for use with gitlab-ce builds with gitaly
This commit is contained in:
parent
1cb3b6104c
commit
616e7d961b
8 changed files with 43 additions and 17 deletions
|
|
@ -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-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 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-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
|
ruby-2.3-static-analyses test: *test_build
|
||||||
www-gitlab-com test: *test_build
|
www-gitlab-com test: *test_build
|
||||||
doc-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-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: *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-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
|
ruby-2.3-static-analyses: *build_and_deploy
|
||||||
www-gitlab-com: *build_and_deploy
|
www-gitlab-com: *build_and_deploy
|
||||||
doc-gitlab-com: *build_and_deploy
|
doc-gitlab-com: *build_and_deploy
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
|
|
||||||
ADD . $PWD
|
ADD . $PWD
|
||||||
|
|
||||||
RUN scripts/install-golang
|
RUN scripts/install-git
|
||||||
|
|
||||||
ENV PATH /usr/local/bin:$PATH
|
ENV PATH /usr/local/bin:$PATH
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
|
|
||||||
ADD . $PWD
|
ADD . $PWD
|
||||||
|
|
||||||
RUN scripts/install-golang
|
RUN scripts/install-git
|
||||||
|
|
||||||
ENV PATH /usr/local/bin:$PATH
|
ENV PATH /usr/local/bin:$PATH
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
|
|
||||||
ADD . $PWD
|
ADD . $PWD
|
||||||
|
|
||||||
RUN scripts/install-golang
|
RUN scripts/install-git
|
||||||
|
|
||||||
ENV PATH /usr/local/bin:$PATH
|
ENV PATH /usr/local/bin:$PATH
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,6 @@ RUN apt-get update && apt-get install -y \
|
||||||
|
|
||||||
ADD . $PWD
|
ADD . $PWD
|
||||||
|
|
||||||
RUN scripts/install-golang
|
RUN scripts/install-git
|
||||||
|
|
||||||
ENV PATH /usr/local/bin:$PATH
|
ENV PATH /usr/local/bin:$PATH
|
||||||
|
|
|
||||||
|
|
@ -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
14
scripts/install-git
Executable 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
|
||||||
|
|
@ -1,14 +1,10 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
mkdir build \
|
GOLANG_VERSION=${1:-1.8}
|
||||||
&& curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \
|
GOLANG_DOWNLOAD_URL="https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz"
|
||||||
&& echo "$GIT_DOWNLOAD_SHA256 git.tar.gz" | sha256sum -c - \
|
GOLANG_DOWNLOAD_SHA256=${2:-53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca}
|
||||||
&& tar -C build -xzf git.tar.gz \
|
|
||||||
&& cd build/git-$GIT_VERSION \
|
curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
|
||||||
&& chmod +x configure \
|
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \
|
||||||
&& ./configure \
|
&& tar -C /usr/local -xzf golang.tar.gz \
|
||||||
&& make all \
|
&& rm golang.tar.gz
|
||||||
&& make install PREFIX=/usr/local \
|
|
||||||
&& cd ../.. \
|
|
||||||
&& rm -rf build \
|
|
||||||
&& rm git.tar.gz
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue