Skip to content

Commit 2f0976d

Browse files
duanhongyiCryptophobia
authored andcommitted
feat(slugbuilder): update stack to heroku-18-build (#10)
1 parent 568f4af commit 2f0976d

3 files changed

Lines changed: 21 additions & 22 deletions

File tree

rootfs/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM heroku/cedar:14
1+
FROM heroku/heroku:18-build
22

3+
ENV DEBIAN_FRONTEND noninteractive
34
RUN mkdir /app
45
RUN addgroup --quiet --gid 2000 slug && \
56
useradd slug --uid=2000 --gid=2000 --home-dir /app --no-create-home
@@ -12,8 +13,6 @@ RUN sed -i -e 's/^deb-src/#deb-src/' /etc/apt/sources.list && \
1213
apt-get autoremove -y && \
1314
apt-get clean -y && \
1415
# package up license files if any by appending to existing tar
15-
COPYRIGHT_TAR='/usr/share/copyrights.tar'; \
16-
gunzip $COPYRIGHT_TAR.gz; tar -rf $COPYRIGHT_TAR /usr/share/doc/*/copyright; gzip $COPYRIGHT_TAR && \
1716
rm -rf \
1817
/usr/share/doc \
1918
/usr/share/man \

rootfs/builder/build.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ trap sleep_before_exit EXIT
99

1010
[[ $DEIS_DEBUG ]] && set -x
1111
unset DEIS_DEBUG
12-
1312
app_dir=/app
1413
build_root=/tmp/build
1514
cache_root=/tmp/cache
@@ -97,13 +96,16 @@ export APP_DIR="$app_dir"
9796
export HOME="$app_dir"
9897
REQUEST_ID=$(openssl rand -base64 32)
9998
export REQUEST_ID
100-
export STACK=cedar-14
99+
export STACK=heroku-18
101100

102101
## copy the environment dir excluding the ephemeral ..data/ dir and other symlinks created by Kubernetes.
103-
104-
if [ "$(ls -A $secret_dir)" ]; then
105-
cp -r $secret_dir/. $env_root/
106-
fi
102+
secret_dir_file_list="$(ls -A $secret_dir)"
103+
for subpath in $secret_dir_file_list; do
104+
full_path="$secret_dir/$subpath"
105+
if [[ -f "$full_path" ]]; then
106+
cp "$full_path" "$env_root/"
107+
fi
108+
done
107109

108110
## SSH key configuration
109111

@@ -152,7 +154,7 @@ if [[ -n "$BUILDPACK_URL" ]]; then
152154
fi
153155

154156
selected_buildpack="$buildpack"
155-
buildpack_name=$($buildpack/bin/detect "$build_root") && selected_buildpack=$buildpack
157+
buildpack_name=$("$buildpack/bin/detect" "$build_root") && selected_buildpack=$buildpack
156158
else
157159
for buildpack in "${buildpacks[@]}"; do
158160
buildpack_name=$("$buildpack/bin/detect" "$build_root") && selected_buildpack=$buildpack && break
@@ -175,9 +177,7 @@ if [[ -f "$build_root/bin/pre-compile" ]]; then
175177
fi
176178

177179
## Buildpack compile
178-
179180
"$selected_buildpack/bin/compile" "$build_root" "$cache_root" "$env_root" | ensure_indent
180-
181181
"$selected_buildpack/bin/release" "$build_root" > $build_root/.release
182182

183183
## Run post-compile hook

rootfs/builder/install-buildpacks

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ download_buildpack() {
2929
mkdir -p $BUILDPACK_INSTALL_PATH
3030

3131
download_buildpack https://github.com/heroku/heroku-buildpack-multi.git v1.0.0 01-multi
32-
download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git v77 02-clojure
33-
download_buildpack https://github.com/heroku/heroku-buildpack-go.git v71 03-go
34-
download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git v23 04-gradle
35-
download_buildpack https://github.com/heroku/heroku-buildpack-grails.git v21 05-grails
36-
download_buildpack https://github.com/heroku/heroku-buildpack-java.git v53 06-java
37-
download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git v110 07-nodejs
38-
download_buildpack https://github.com/heroku/heroku-buildpack-php.git v121 08-php
32+
download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git v82 02-clojure
33+
download_buildpack https://github.com/heroku/heroku-buildpack-go.git v94 03-go
34+
download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git v27 04-gradle
35+
download_buildpack https://github.com/heroku/heroku-buildpack-grails.git v21 05-grails
36+
download_buildpack https://github.com/heroku/heroku-buildpack-java.git v62 06-java
37+
download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git v130 07-nodejs
38+
download_buildpack https://github.com/heroku/heroku-buildpack-php.git v145 08-php
3939
download_buildpack https://github.com/heroku/heroku-buildpack-play.git v26 09-play
40-
download_buildpack https://github.com/heroku/heroku-buildpack-python.git v109 10-python
41-
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v167 11-ruby
42-
download_buildpack https://github.com/heroku/heroku-buildpack-scala.git v77 12-scala
40+
download_buildpack https://github.com/heroku/heroku-buildpack-python.git v144 10-python
41+
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v195 11-ruby
42+
download_buildpack https://github.com/heroku/heroku-buildpack-scala.git v82 12-scala

0 commit comments

Comments
 (0)