[push] Moving install.js to 19.08 upgrade, cleanup

Author: iartem

.dockerignore

@@ -1,3 +1,4 @@
 .git
 .github
-.DS_Store
+.DS_Store
+.Dockerfile*

Dockerfile-api

@@ -15,12 +15,11 @@ ENTRYPOINT ["/tini", "-v", "--"]
 RUN apt-get update && apt-get -y install sendmail sqlite3 gcc-4.8 g++-4.8 && \
 	export CXX="g++-4.8" && \
 	export CC="gcc-4.8" && \
-	update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90 && \
-	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+	update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
 
 # Required by push plugin
-RUN git clone https://github.com/nghttp2/nghttp2.git $DIR/nghttp2 && \
-	cd $DIR/nghttp2 && \
+RUN git clone https://github.com/nghttp2/nghttp2.git /tmp/nghttp2 && \
+	cd /tmp/nghttp2 && \
 	git checkout tags/v1.30.0 && \
 	export CFLAGS="-g -O2 -fPIC" && export CPPFLAGS="-fPIC" && autoreconf -i && automake && autoconf && ./configure --disable-examples --disable-app && make && make install
 
@@ -33,13 +32,18 @@ RUN mkdir /opt/countly && chown 1001:1001 /opt/countly
 USER 1001
 WORKDIR /opt/countly
 COPY --chown=1001 . .
-HEALTHCHECK --start-period=120s CMD curl --fail http://localhost:3001/o/ping || exit 1
+HEALTHCHECK --start-period=60s CMD curl --fail http://localhost:3001/o/ping || exit 1
 
 ## API runtime dependencies
 RUN cp -n api/config.sample.js api/config.js && \
 	cp -n frontend/express/config.sample.js frontend/express/config.js && \
 	HOME=/tmp npm install && \
-	./bin/docker/preinstall.sh && \
-	rm -rf /tmp/*
+	./bin/docker/preinstall.sh
+
+USER root
+RUN apt-get remove -y git cpp-4.8 gcc-4.8 g++-4.8 gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
+	apt-get autoremove -y && \
+	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+USER 1001
 CMD ["/opt/countly/bin/docker/cmd.sh"]

Dockerfile-frontend

@@ -30,7 +30,12 @@ RUN cp -n frontend/express/public/javascripts/countly/countly.config.sample.js f
 	cp -n frontend/express/config.sample.js frontend/express/config.js && \
 	cp -n api/config.sample.js api/config.js && \
 	HOME=/tmp npm install && \
-	./bin/docker/preinstall.sh && \
-	rm -rf /tmp/*
+	./bin/docker/preinstall.sh
 
+USER root
+RUN apt-get remove -y git g++ gcc make automake autoconf libtool pkg-config unzip python && \
+	apt-get autoremove -y && \
+	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+USER 1001
 CMD ["/opt/countly/bin/docker/cmd.sh"]

bin/docker/preinstall.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x #echo on
 
 for plugin in `find /opt/countly/plugins -type d -mindepth 1 -maxdepth 1`
 do