File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -6,11 +6,11 @@ export GO15VENDOREXPERIMENT=1
66
77LDFLAGS := "-s -X main.version=${VERSION}"
88IMAGE_PREFIX ?= hephy
9- BINDIR := ./rootfs/bin
9+ BINDIR := ./rootfs/usr/ bin
1010
1111include 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
Original file line number Diff line number Diff line change 1- FROM heroku/heroku:18 -build
1+ FROM heroku/heroku:20 -build
22
33ENV DEBIAN_FRONTEND noninteractive
44RUN mkdir /app
@@ -30,16 +30,16 @@ RUN sed -i -e 's/^deb-src/#deb-src/' /etc/apt/sources.list && \
3030
3131ADD . /
3232ENV 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
4444USER slug
4545ENV HOME /app
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
You can’t perform that action at this time.
0 commit comments