Merge branch 'powershell-command-line' of github.com:hackoregon/data-…

…science-pet-containers into powershell-command-line
hackoregon · Apr 2, 2018 · eaecf3a · eaecf3a
2 parents e77d1dd + b86f604
commit eaecf3a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/docs/Mint18-Xenial/install-docker-17.bash b/docs/Mint18-Xenial/install-docker-17.bash
@@ -4,7 +4,7 @@ echo "Installing Docker CE"
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 sudo add-apt-repository \
   "deb [arch=amd64] https://download.docker.com/linux/ubuntu trusty stable"
-sudo apt-get update && sudo apt-get install docker-ce
+sudo apt-get update && sudo apt-get install -y docker-ce curl
 
 echo "Installing Docker Compose"
 export COMPOSE_VERSION=1.19.0

diff --git a/docs/Mint18-Xenial/install-postgresql-17.bash b/docs/Mint18-Xenial/install-postgresql-17.bash
@@ -17,7 +17,6 @@ sudo apt-get install -y \
   osm2pgsql \
   postgresql-9.6 \
   postgresql-9.6-mysql-fdw \
-  postgresql-9.6-ogr-fdw \
   postgresql-9.6-pgrouting \
   postgresql-9.6-pgrouting-doc \
   postgresql-9.6-pgrouting-scripts \
@@ -27,8 +26,7 @@ sudo apt-get install -y \
   postgresql-client-9.6 \
   postgresql-doc-9.6 \
   postgresql-server-dev-9.6 \
-  pgadmin4 \
-  pgadmin4-doc
+  pgadmin3
 
 echo "Adding '${USER}' to the database superusers"
 sudo su - postgres -c "createuser -s $USER"