From dc58ee3558af36786c633c9cd81be40f10106ec3 Mon Sep 17 00:00:00 2001
From: CatDeployed <dev@catdeployed.com>
Date: Thu, 2 Aug 2018 04:45:32 +0200
Subject: [PATCH] restore ubuntu

---
 ubuntu/Dockerfile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 6433d33..bd6b26b 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,17 +1,18 @@
-FROM ruby:2.4-alpine
+FROM ruby:2.4
 
-RUN apk --no-cache add nodejs mysql-client git bash python libcap py-setuptools py-pip build-base python-dev mariadb-dev \
+RUN apt-get -y update \
+	&& apt-get -y install --no-install-recommends nodejs mysql-client git-core python-minimal python-pip python-dev libcap2-bin python-setuptools \
 	&& pip install j2cli \
         && git clone https://github.com/atech/postal.git /opt/postal \
 	&& rm -rf /var/lib/apt/lists/* \
-	&& gem install tzinfo-data \
 	&& gem install bundler \
 	&& gem install procodile \
-	&& addgroup -S postal \
-	&& adduser -S -G postal -h /opt/postal -s /bin/bash postal \
+	&& useradd -r -d /opt/postal -s /bin/bash postal \
 	&& chown -R postal:postal /opt/postal/ \
 	&& /opt/postal/bin/postal bundle /opt/postal/vendor/bundle \
-	&& rm -rf /var/cache/apk/*
+	&& apt-get -y purge python-dev git-core \
+	&& apt-get -y autoremove \
+	&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ## Adjust permissions
 RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/ruby