Skip to content

Commit f9b348e

Browse files
committed
feat(builder): remove Dockerfile shim
Instead of using a shim Dockerfile, use ONBUILD directives in slugrunner.
1 parent 5c5f822 commit f9b348e

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

builder/rootfs/etc/confd/templates/builder

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ if [ ! -f Dockerfile ]; then
118118

119119
# copy out the compiled slug
120120
docker cp $JOB:/tmp/slug.tgz $TMP_DIR
121-
# copy over the Dockerfile shim to the build dir
122-
cp $DOCKERFILE_SHIM ./Dockerfile
121+
echo "FROM deis/slugrunner" > ./Dockerfile
123122
fi
124123

125124
# force newline

builder/rootfs/usr/local/share/shim.dockerfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

builder/rootfs/usr/local/src/slugrunner/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ ENV HOME /app
1818
ENTRYPOINT ["/runner/init"]
1919

2020
ENV DEIS_RELEASE 1.10.0-dev
21+
22+
ONBUILD RUN mkdir -p /app
23+
ONBUILD WORKDIR /app
24+
ONBUILD ADD slug.tgz /app

0 commit comments

Comments
 (0)