From 4941c5cf646a78e139465b123f4d0608c52287eb Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 26 May 2020 22:37:59 -0700 Subject: [PATCH 1/4] Add .gitignore for .idea --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea From dc7e538ef76b880b285013e0f5fe6feedc8331c5 Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 26 May 2020 23:10:16 -0700 Subject: [PATCH 2/4] Clean up comments in www-gitlab-com --- scripts/install-www-gitlab-com | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 806930a..325dd52 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -5,29 +5,30 @@ IFS=$'\n\t' export DEBIAN_FRONTEND=noninteractive -# Install LaTeX and pandoc 2.3.1 +# Install LaTeX and other packages apt-get update apt-get install -yq --no-install-recommends \ make gcc g++ locales \ rsync git-core texlive-latex-recommended texlive-xetex \ texlive-fonts-recommended lmodern ed file curl gnupg2 \ - yamllint python3-pkg-resources \ + yamllint python3-pkg-resources +# Install pandoc cd /tmp curl -L -O https://github.com/jgm/pandoc/releases/download/2.3.1/pandoc-2.3.1-linux.tar.gz tar xvf pandoc-2.3.1-linux.tar.gz cp pandoc-2.3.1/bin/* /usr/local/bin rm -rf /tmp/pandoc* -# For cropping the pictures on the team page +# Install Imagemagick for cropping the pictures on the team page apt-get install -yq --no-install-recommends imagemagick -# Installing node & yarn +# Instal node & yarn NODE_INSTALL_VERSION=12.4.0 YARN_INSTALL_VERSION=1.21.1-1 /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version -# Installing gitlab-runner +# Instal gitlab-runner curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper chmod +x /usr/bin/gitlab-runner-helper @@ -38,6 +39,7 @@ locale-gen update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8 locale -a +# Clean up apt-get autoremove -yq apt-get clean -yqq rm -rf /var/lib/apt/lists/* From 865f5cb8d230da1ae91db58182dd5d839b98c87c Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 26 May 2020 23:25:39 -0700 Subject: [PATCH 3/4] Add unzip to www-gitlab-com --- scripts/install-www-gitlab-com | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 325dd52..31ed138 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -11,7 +11,7 @@ apt-get install -yq --no-install-recommends \ make gcc g++ locales \ rsync git-core texlive-latex-recommended texlive-xetex \ texlive-fonts-recommended lmodern ed file curl gnupg2 \ - yamllint python3-pkg-resources + yamllint python3-pkg-resources unzip # Install pandoc cd /tmp From edc1ff095c4ad79bc6069edf7cebb8a817e2f882 Mon Sep 17 00:00:00 2001 From: Chad Woolley Date: Tue, 26 May 2020 23:10:35 -0700 Subject: [PATCH 4/4] Add Google cloud SDK to www-gitlab-com --- scripts/install-www-gitlab-com | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com index 31ed138..01ff22d 100755 --- a/scripts/install-www-gitlab-com +++ b/scripts/install-www-gitlab-com @@ -20,15 +20,21 @@ tar xvf pandoc-2.3.1-linux.tar.gz cp pandoc-2.3.1/bin/* /usr/local/bin rm -rf /tmp/pandoc* +# Install Google Cloud SDK for deploys via rsync +echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list +curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - +apt-get update +apt-get install -yq --no-install-recommends google-cloud-sdk + # Install Imagemagick for cropping the pictures on the team page apt-get install -yq --no-install-recommends imagemagick -# Instal node & yarn +# Install node & yarn NODE_INSTALL_VERSION=12.4.0 YARN_INSTALL_VERSION=1.21.1-1 /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version -# Instal gitlab-runner +# Install gitlab-runner curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper chmod +x /usr/bin/gitlab-runner-helper