Skip to content

Commit 73ecafb

Browse files
author
Kingdon Barrett
committed
feat(slugbuilder): update stack to heroku-20-build
1 parent 3187fa8 commit 73ecafb

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export GO15VENDOREXPERIMENT=1
66

77
LDFLAGS := "-s -X main.version=${VERSION}"
88
IMAGE_PREFIX ?= hephy
9-
BINDIR := ./rootfs/bin
9+
BINDIR := ./rootfs/usr/bin
1010

1111
include versioning.mk
1212

13-
SHELL_SCRIPTS = $(wildcard _scripts/*.sh) $(wildcard rootfs/bin/*_object) $(wildcard rootfs/bin/*_cache) rootfs/bin/normalize_storage $(wildcard rootfs/builder/*)
13+
SHELL_SCRIPTS = $(wildcard _scripts/*.sh) $(wildcard rootfs/usr/bin/*_object) $(wildcard rootfs/usr/bin/*_cache) rootfs/usr/bin/normalize_storage $(wildcard rootfs/builder/*)
1414

1515
# The following variables describe the containerized development environment
1616
# and other build options

rootfs/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM heroku/heroku:18-build
1+
FROM heroku/heroku:20-build
22

33
ENV DEBIAN_FRONTEND noninteractive
44
RUN mkdir /app
@@ -30,16 +30,16 @@ RUN sed -i -e 's/^deb-src/#deb-src/' /etc/apt/sources.list && \
3030

3131
ADD . /
3232
ENV PYTHONPATH $PYTHONPATH:/usr/local/lib/python3/site-packages
33-
ADD https://storage.googleapis.com/hephy-obj-storage-cli/bb8e054/objstorage /bin/objstorage
34-
RUN chmod +x /bin/objstorage && \
33+
ADD https://storage.googleapis.com/hephy-obj-storage-cli/bb8e054/objstorage /usr/bin/objstorage
34+
RUN chmod +x /usr/bin/objstorage && \
3535
chown -R slug:slug /app && \
36-
chown slug:slug /bin/get_object \
37-
/bin/normalize_storage \
38-
/bin/put_object \
39-
/bin/objstorage \
40-
/bin/read_procfile_keys \
41-
/bin/restore_cache \
42-
/bin/store_cache
36+
chown slug:slug /usr/bin/get_object \
37+
/usr/bin/normalize_storage \
38+
/usr/bin/put_object \
39+
/usr/bin/objstorage \
40+
/usr/bin/read_procfile_keys \
41+
/usr/bin/restore_cache \
42+
/usr/bin/store_cache
4343

4444
USER slug
4545
ENV HOME /app

0 commit comments

Comments
 (0)