From 757a4af689595498d936206e2e65d778a6b83610 Mon Sep 17 00:00:00 2001
From: Vassiliy Yegorov <vasyakrg@gmail.com>
Date: Fri, 17 Jul 2020 14:38:53 +0700
Subject: [PATCH] fixup s3 ver

---
 assets/build/install.sh | 42 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/assets/build/install.sh b/assets/build/install.sh
index db3985f..bfb47ab 100644
--- a/assets/build/install.sh
+++ b/assets/build/install.sh
@@ -5,15 +5,14 @@ set -e
 DEBIAN_FRONTEND=noninteractive
 
 apt-get update && \
-apt-get install -y ca-certificates mysql-client nfs-common git wget python-setuptools cron iputils-ping curl nano gnupg
+apt-get install -y gnupg2 git wget python-setuptools cron iputils-ping curl nano lsb-release apt-utils software-properties-common && \
 
-# postgres 11
-# TODO добавить поддержку нескольких версий и по кейсу понимать какую надо подставлять
-curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+# psql
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list && \
+apt-get update && \
+apt-get install -y postgresql-client-10 postgresql-client-11 postgresql-client-12 mysql-client nfs-common
 
-echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee  /etc/apt/sources.list.d/pgdg.list
-
-apt update && apt-get install -y postgresql-client-10 postgresql-client-11 postgresql-client-12 mysql-client nfs-common
 
 # mongo
 wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add -
@@ -28,14 +27,12 @@ mv mo /usr/local/bin/
 
 # s3
 echo -e "\n====> Install S3"
-wget -O s3tools.tar.gz https://sourceforge.net/projects/s3tools/files/s3cmd/2.0.2/s3cmd-2.0.2.tar.gz/download && \
-( tar xvfz s3tools.tar.gz && cd s3cmd-2.0.2 && \
-  python setup.py install && s3cmd --configure ) && rm -rf s3cmd-2.0.2
+wget -O s3tools.tar.gz https://sourceforge.net/projects/s3tools/files/s3cmd/2.1.0/s3cmd-2.1.0.tar.gz/download && \
+( tar xvfz s3tools.tar.gz && cd s3cmd-2.1.0 && \
+  python setup.py install && s3cmd --configure ) && rm -rf s3cmd-2.1.0
 
 # b2
 echo -e "\n====> Install B2"
-# git clone https://github.com/Backblaze/B2_Command_Line_Tool.git && \
-# ( cd B2_Command_Line_Tool && python setup.py install ) && rm -rf B2_Command_Line_Tool
 apt-get install python-pip python-dev build-essential -y
 pip install --upgrade pip
 pip install --upgrade b2==1.4.2
@@ -46,27 +43,6 @@ pip install --upgrade b2==1.4.2
 # curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash && \
 # apt-get install git-lfs && \
 
-# # Docker
-# echo -e "\n====> Install docker"
-# apt update && \
-# apt install -y apt-transport-https ca-certificates curl software-properties-common
-
-# curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
-# apt-key fingerprint 0EBFCD88 && \
-# add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-
-# apt update && \
-# apt install -y docker-ce
-
-# #docker version
-
-# # Docker compose
-# echo -e "\n====> Install docker-compose"
-# curl -L "https://github.com/docker/compose/releases/download/1.23.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \
-# chmod +x /usr/local/bin/docker-compose
-
-# #docker-compose version
-
 # Post install tasks
 mkdir -p /srv/backup
 find /etc/cron.* -type f ! -name .placeholder -delete