From 73ecafb92bbf705994433c72b84895ddc6ebffba Mon Sep 17 00:00:00 2001
From: Kingdon Barrett <kingdon@weave.works>
Date: Sat, 6 Feb 2021 21:25:19 -0500
Subject: [PATCH] feat(slugbuilder): update stack to heroku-20-build

---
 Makefile                                |  4 ++--
 rootfs/Dockerfile                       | 20 ++++++++++----------
 rootfs/{ => usr}/bin/get_object         |  0
 rootfs/{ => usr}/bin/normalize_storage  |  0
 rootfs/{ => usr}/bin/put_object         |  0
 rootfs/{ => usr}/bin/read_procfile_keys |  0
 rootfs/{ => usr}/bin/restore_cache      |  0
 rootfs/{ => usr}/bin/store_cache        |  0
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename rootfs/{ => usr}/bin/get_object (100%)
 rename rootfs/{ => usr}/bin/normalize_storage (100%)
 rename rootfs/{ => usr}/bin/put_object (100%)
 rename rootfs/{ => usr}/bin/read_procfile_keys (100%)
 rename rootfs/{ => usr}/bin/restore_cache (100%)
 rename rootfs/{ => usr}/bin/store_cache (100%)

diff --git a/Makefile b/Makefile
index f20e498..7e52507 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,11 @@ export GO15VENDOREXPERIMENT=1
 
 LDFLAGS := "-s -X main.version=${VERSION}"
 IMAGE_PREFIX ?= hephy
-BINDIR := ./rootfs/bin
+BINDIR := ./rootfs/usr/bin
 
 include versioning.mk
 
-SHELL_SCRIPTS = $(wildcard _scripts/*.sh) $(wildcard rootfs/bin/*_object) $(wildcard rootfs/bin/*_cache) rootfs/bin/normalize_storage $(wildcard rootfs/builder/*)
+SHELL_SCRIPTS = $(wildcard _scripts/*.sh) $(wildcard rootfs/usr/bin/*_object) $(wildcard rootfs/usr/bin/*_cache) rootfs/usr/bin/normalize_storage $(wildcard rootfs/builder/*)
 
 # The following variables describe the containerized development environment
 # and other build options
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 7ef62ed..9d19494 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM heroku/heroku:18-build
+FROM heroku/heroku:20-build
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN mkdir /app
@@ -30,16 +30,16 @@ RUN sed -i -e 's/^deb-src/#deb-src/' /etc/apt/sources.list && \
 
 ADD . /
 ENV PYTHONPATH $PYTHONPATH:/usr/local/lib/python3/site-packages
-ADD https://storage.googleapis.com/hephy-obj-storage-cli/bb8e054/objstorage /bin/objstorage
-RUN chmod +x /bin/objstorage && \
+ADD https://storage.googleapis.com/hephy-obj-storage-cli/bb8e054/objstorage /usr/bin/objstorage
+RUN chmod +x /usr/bin/objstorage && \
     chown -R slug:slug /app && \
-    chown slug:slug /bin/get_object \
-                    /bin/normalize_storage \
-                    /bin/put_object \
-                    /bin/objstorage \
-                    /bin/read_procfile_keys \
-                    /bin/restore_cache \
-                    /bin/store_cache
+    chown slug:slug /usr/bin/get_object \
+                    /usr/bin/normalize_storage \
+                    /usr/bin/put_object \
+                    /usr/bin/objstorage \
+                    /usr/bin/read_procfile_keys \
+                    /usr/bin/restore_cache \
+                    /usr/bin/store_cache
 
 USER slug
 ENV HOME /app
diff --git a/rootfs/bin/get_object b/rootfs/usr/bin/get_object
similarity index 100%
rename from rootfs/bin/get_object
rename to rootfs/usr/bin/get_object
diff --git a/rootfs/bin/normalize_storage b/rootfs/usr/bin/normalize_storage
similarity index 100%
rename from rootfs/bin/normalize_storage
rename to rootfs/usr/bin/normalize_storage
diff --git a/rootfs/bin/put_object b/rootfs/usr/bin/put_object
similarity index 100%
rename from rootfs/bin/put_object
rename to rootfs/usr/bin/put_object
diff --git a/rootfs/bin/read_procfile_keys b/rootfs/usr/bin/read_procfile_keys
similarity index 100%
rename from rootfs/bin/read_procfile_keys
rename to rootfs/usr/bin/read_procfile_keys
diff --git a/rootfs/bin/restore_cache b/rootfs/usr/bin/restore_cache
similarity index 100%
rename from rootfs/bin/restore_cache
rename to rootfs/usr/bin/restore_cache
diff --git a/rootfs/bin/store_cache b/rootfs/usr/bin/store_cache
similarity index 100%
rename from rootfs/bin/store_cache
rename to rootfs/usr/bin/store_cache