Skip to content

Commit

Permalink
Merge pull request #86 from mayankmendix/master
Browse files Browse the repository at this point in the history
[DES-1880] Add git to Docker Buildpack rootfs
  • Loading branch information
zlogic authored Jan 22, 2020
2 parents 9312730 + 1fd50a1 commit 84f7c2e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN mkdir -p /opt/mendix/buildpack /opt/mendix/build &&\
chmod g+w /etc/passwd

# Copy python scripts which execute the buildpack (exporting the VCAP variables)
COPY --chown=mendix:root scripts/compilation /opt/mendix/buildpack
COPY --chown=mendix:root scripts/compilation scripts/git /opt/mendix/buildpack/
# Copy project model/sources
COPY --chown=mendix:root $BUILD_PATH /opt/mendix/build

Expand All @@ -48,7 +48,7 @@ ENV PYTHONPATH "/opt/mendix/buildpack/lib/"
# 7. Update permissions for /opt/mendix/build so that the app can run as a non-root user
WORKDIR /opt/mendix/buildpack
RUN mkdir -p /tmp/buildcache &&\
chmod +rx /opt/mendix/buildpack/compilation &&\
chmod +rx /opt/mendix/buildpack/compilation /opt/mendix/buildpack/git &&\
"/opt/mendix/buildpack/compilation" /opt/mendix/build /tmp/buildcache &&\
rm -fr /tmp/buildcache /tmp/javasdk /tmp/opt &&\
ln -s /opt/mendix/.java /opt/mendix/build &&\
Expand Down
1 change: 1 addition & 0 deletions scripts/compilation
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def export_vcap_services():
.format(vcap_services_str))

os.environ['VCAP_SERVICES'] = vcap_services_str
os.environ["PATH"] += os.pathsep + "/opt/mendix/buildpack"

def call_buildpack_compilation():
logging.debug("Executing call_buildpack_compilation...")
Expand Down
2 changes: 2 additions & 0 deletions scripts/git
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
echo Git_Commit

0 comments on commit 84f7c2e

Please sign in to comment.