update Dockerfile

aquametalabs · Nov 20, 2018 · b7b8e2a · b7b8e2a
1 parent 3fd44bb
commit b7b8e2a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:18.04
 MAINTAINER Eric Hanson <eric@aquameta.com>
 
 # to build:
@@ -13,22 +13,20 @@ MAINTAINER Eric Hanson <eric@aquameta.com>
 #
 # access the ide by browsing to port 80 of the host machine.
 
-ENV REFRESHED_AT 2018-01-02
+ENV REFRESHED_AT 2018-11-19
 
-# cp the repo to /s
-RUN mkdir -p /s/aquameta
-COPY . /s/aquameta/
+# copy the repo to /tmp
+RUN mkdir -p /tmp/aquameta
+COPY . /tmp/aquameta/
 
 
-#################### docker container ###############################
-# finally, setup our container
 USER root
-WORKDIR /s/aquameta
+WORKDIR /tmp/aquameta
 RUN ./install.sh --silent
-COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+# COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
 
 EXPOSE 80 5432
 # VOLUME  ["/etc/postgresql", "/var/log/postgresql", "/var/lib/postgresql"]
-ENTRYPOINT ["/usr/bin/supervisord"]
+# ENTRYPOINT ["/usr/bin/supervisord"]
 
diff --git a/install.sh b/install.sh
@@ -45,11 +45,17 @@ fi
 # apt packages
 #############################################################################
 
-sudo add-apt-repository universe
+# update
 apt-get update -y
-apt-get install -y postgresql-10 postgresql-10-python-multicorn postgresql-server-dev-10 postgresql-plpython-10 python-pip python-werkzeug python-psycopg2 sendmail nginx
 
-# wget ca-certificates lsb-release git python python-pip python-dev nginx python-setuptools sudo libssl-dev libxml2-dev libossp-uuid-dev gettext libperl-dev libreadline-dev pgxnclient fuse libfuse-dev sendmail supervisor
+# add the universe repository
+apt-get install -y software-properties-common
+add-apt-repository universe
+
+# install required packages
+apt-get install -y postgresql-10 postgresql-10-python-multicorn postgresql-server-dev-10 postgresql-plpython-10 python-pip python-werkzeug python-psycopg2 sendmail nginx sudo
+
+# wget ca-certificates lsb-release git python python-pip python-dev nginx python-setuptools libssl-dev libxml2-dev libossp-uuid-dev gettext libperl-dev libreadline-dev pgxnclient fuse libfuse-dev supervisor