Merge branch 'master' into makefile

Dockerfile

@@ -18,10 +18,8 @@ EXPOSE 11625
 EXPOSE 11626
 
 ADD dependencies /
-RUN ["chmod", "+x", "dependencies"]
 RUN /dependencies
 
-RUN apt-get -y install libunwind8 postgresql curl sqlite libc++abi1-12 libc++1-12
 COPY --from=stellar-core /usr/local/bin/stellar-core /usr/bin/stellar-core
 
 COPY --from=horizon /go/bin/horizon /usr/bin/stellar-horizon

dependencies

@@ -4,12 +4,13 @@ set -e
 # dependencies
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install -y curl wget git apt-transport-https \
-                   libpq-dev libsqlite3-dev libsasl2-dev \
+apt-get install -y curl apt-transport-https \
                    postgresql-client postgresql postgresql-contrib \
-                   sudo vim zlib1g-dev supervisor psmisc \
-                   nginx rsync jq netcat # Parsing stellar-core JSON for standalone network and checking core HTTP server
+                   sudo supervisor psmisc \
+                   nginx rsync jq netcat \
+                   libunwind8 sqlite libc++abi1-12 libc++1-12
 apt-get clean
+rm -rf /var/lib/apt/lists/*
 
 chown -R www-data:www-data /var/lib/nginx