From 73647ac046935f612f9e90f834d63dcf17de1548 Mon Sep 17 00:00:00 2001
From: Alexander <aheaven87@gmail.com>
Date: Fri, 24 Jun 2016 11:08:26 +0700
Subject: [PATCH 1/2] Upgrade jemalloc to 4.2.1

---
 Makefile    | 6 +++---
 bin/compile | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f584157..20dda8d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 default: cedar-14
 
-cedar-14: dist/cedar-14/jemalloc-3.6.0-1.tar.gz
+cedar-14: dist/cedar-14/jemalloc-4.2.1-1.tar.gz
 
-dist/cedar-14/jemalloc-3.6.0-1.tar.gz: jemalloc-cedar-14
+dist/cedar-14/jemalloc-4.2.1-1.tar.gz: jemalloc-cedar-14
 	docker cp $<:/tmp/jemalloc-cedar-14.tar.gz .
 	mkdir -p $$(dirname $@)
 	mv jemalloc-cedar-14.tar.gz $@
@@ -13,7 +13,7 @@ clean:
 
 src/jemalloc.tar.bz2:
 	mkdir -p $$(dirname $@)
-	curl -sL http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2 -o $@
+	curl -sL https://github.com/jemalloc/jemalloc/releases/download/4.2.1/jemalloc-4.2.1.tar.bz2 -o $@
 
 .PHONY: cedar-14-stack
 
diff --git a/bin/compile b/bin/compile
index b326e78..9a9a7ab 100755
--- a/bin/compile
+++ b/bin/compile
@@ -35,7 +35,7 @@ function vendor() {
 }
 
 echo "-----> Vendoring binaries"
-vendor "https://s3.amazonaws.com/mojodna-heroku/$STACK/jemalloc-3.6.0-1.tar.gz" "$BUILD_DIR/vendor/jemalloc"
+vendor "https://s3.amazonaws.com/mojodna-heroku/$STACK/jemalloc-4.2.1-1.tar.gz" "$BUILD_DIR/vendor/jemalloc"
 
 echo "-----> Configuring build environment"
 

From a810d59ad92edc0b63d77c4206c6ab5613e33e5c Mon Sep 17 00:00:00 2001
From: Alexander <aheaven87@gmail.com>
Date: Fri, 24 Jun 2016 15:26:09 +0700
Subject: [PATCH 2/2] Remove postgresql from Dockerfile

---
 cedar-14-stack/Dockerfile | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/cedar-14-stack/Dockerfile b/cedar-14-stack/Dockerfile
index fe41abc..bbfff2c 100644
--- a/cedar-14-stack/Dockerfile
+++ b/cedar-14-stack/Dockerfile
@@ -9,20 +9,3 @@ RUN \
 
 RUN \
   apt-get upgrade -y
-
-ADD ./postgresql.tar.gz /tmp
-RUN \
-  mkdir -p /app/vendor && \
-  cd /tmp/postgresql-* && \
-  ./configure --prefix=/app/vendor/pgsql --with-openssl
-
-RUN \
-  cd /tmp/postgresql-* && \
-  make -C src/bin install-strip && \
-  cp src/backend/utils/fmgroids.h src/include/utils/fmgroids.h && \
-  make -C src/include install-strip && \
-  make -C src/interfaces install-strip
-
-RUN \
-  cd /app/vendor/pgsql && \
-  tar zcf /tmp/pgsql-cedar-14-stack.tar.gz .