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

Fix for bug that forces all Go binaries to be based on Go 1.8 (the default)

Browse source
This commit is contained in:
Andrew Newdigate 2017-12-21 11:55:07 +00:00 • committed by Marin Jankovski
parent ab7d1bf72f
commit 6725e787b0
11 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.custom
View file

@ -33,9 +33,9 @@ ARG YARN_INSTALL_VERSION
RUN if [ -n "$NODE_INSTALL_VERSION" ] ; then /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version; fi RUN if [ -n "$NODE_INSTALL_VERSION" ] ; then /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version; fi
# Golang # Golang
ARG GOLANG_VERSION ARG INSTALL_GOLANG_VERSION
ARG GOLANG_DOWNLOAD_SHA256 ARG GOLANG_DOWNLOAD_SHA256
RUN if [ -n "$GOLANG_VERSION" ] ; then /scripts/install-golang && go version; fi RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTALL_GOLANG_VERSION}" "${GOLANG_DOWNLOAD_SHA256}" && go version; fi
# Postgres # Postgres
# Codedebt: currently this will only install the default version of postgres, # Codedebt: currently this will only install the default version of postgres,

2
Dockerfile.www-gitlab-com
View file

@ -1,7 +1,5 @@
FROM ruby:2.3-slim FROM ruby:2.3-slim
ENV PACKAGES="git-core pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended lmodern ed file curl"
ADD / / ADD / /
RUN /scripts/install-www-gitlab-com RUN /scripts/install-www-gitlab-com

6
scripts/custom-docker-build
View file

@ -7,17 +7,17 @@ function print_golang_args() {
case "$1" in case "$1" in
1.8) 1.8)
GOLANG_VERSION=1.8 INSTALL_GOLANG_VERSION=1.8
GOLANG_DOWNLOAD_SHA256=253ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca GOLANG_DOWNLOAD_SHA256=253ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
;; ;;
1.9) 1.9)
GOLANG_VERSION=1.9.2 INSTALL_GOLANG_VERSION=1.9.2
GOLANG_DOWNLOAD_SHA256=de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b GOLANG_DOWNLOAD_SHA256=de874549d9a8d8d8062be05808509c09a88a248e77ec14eb77453530829ac02b
;; ;;
*) echo "Unknown golang version $1"; exit 1; *) echo "Unknown golang version $1"; exit 1;
esac esac
printf -- "--build-arg GOLANG_VERSION=%s " "$GOLANG_VERSION" printf -- "--build-arg INSTALL_GOLANG_VERSION=%s " "$INSTALL_GOLANG_VERSION"
printf -- "--build-arg GOLANG_DOWNLOAD_SHA256=%s " "$GOLANG_DOWNLOAD_SHA256" printf -- "--build-arg GOLANG_DOWNLOAD_SHA256=%s " "$GOLANG_DOWNLOAD_SHA256"
} }

4
scripts/install-chrome
View file

@ -1,8 +1,10 @@
#!/bin/bash #!/bin/bash
set -xeo pipefail set -xeuo pipefail
IFS=$'\n\t'
CHROME_VERSION=${1:-60.0.3112.90-1} CHROME_VERSION=${1:-60.0.3112.90-1}
export DEBIAN_FRONTEND=noninteractive
curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add - curl -sS -L https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list

5
scripts/install-essentials
View file

@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
set -xeo pipefail set -xeuo pipefail
IFS=$'\n\t'
export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install -y \ apt-get install -y \

5
scripts/install-git
View file

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/bash
set -xeuo pipefail
IFS=$'\n\t'
mkdir build \ mkdir build \
&& curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \ && curl -fsSL "$GIT_DOWNLOAD_URL" -o git.tar.gz \

17
scripts/install-golang
View file

@ -1,10 +1,13 @@
#!/bin/bash #!/bin/bash
GOLANG_VERSION=${1:-1.8} set -xeou pipefail
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 \ INSTALL_GOLANG_VERSION=${1}
&& echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ GOLANG_DOWNLOAD_SHA256=${2}
&& tar -C /usr/local -xzf golang.tar.gz \
&& rm golang.tar.gz GOLANG_DOWNLOAD_URL="https://golang.org/dl/go${INSTALL_GOLANG_VERSION}.linux-amd64.tar.gz"
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

4
scripts/install-node
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail
set -xeo pipefail IFS=$'\n\t'
NODE_INSTALL_VERSION=${1:-7.x} NODE_INSTALL_VERSION=${1:-7.x}
YARN_INSTALL_VERSION=${2:-0.27.5-1} YARN_INSTALL_VERSION=${2:-0.27.5-1}

6
scripts/install-postgresql
View file

@ -1,10 +1,12 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail
IFS=$'\n\t'
set -xeo pipefail export DEBIAN_FRONTEND=noninteractive
curl -sS -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - curl -sS -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list
apt-get update apt-get update
env DEBIAN_FRONTEND="noninteractive" apt-get install -y postgresql-client apt-get install -y postgresql-client
apt-get autoremove -yq apt-get autoremove -yq

4
scripts/install-ruby
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail
set -xeo pipefail IFS=$'\n\t'
cd /tmp cd /tmp
wget http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz wget http://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.2.tar.gz

8
scripts/install-www-gitlab-com
View file

@ -1,11 +1,15 @@
#!/bin/bash #!/bin/bash
set -xeo pipefail set -xeuo pipefail
IFS=$'\n\t'
export DEBIAN_FRONTEND=noninteractive
apt-get update apt-get update
apt-get install -yq --no-install-recommends \ apt-get install -yq --no-install-recommends \
make gcc g++ locales \ make gcc g++ locales \
$PACKAGES git-core pandoc texlive-latex-recommended texlive-xetex \
texlive-fonts-recommended lmodern ed file curl
apt-get autoremove -yq apt-get autoremove -yq