Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify Tomcat che.sh bootsrap script #2786

Merged
merged 1 commit into from
Oct 27, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ FROM alpine:3.4
ENV LANG=C.UTF-8 \
JAVA_HOME=/usr/lib/jvm/default-jvm/jre \
PATH=${PATH}:${JAVA_HOME}/bin \
CHE_HOME=/home/user/che \
DOCKER_VERSION=1.6.0 \
DOCKER_BUCKET=get.docker.com
DOCKER_BUCKET=get.docker.com \
CHE_IN_CONTAINER=true

RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
apk upgrade --update && \
Expand All @@ -46,13 +46,6 @@ RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/reposit
rm -rf /tmp/* /var/cache/apk/*

EXPOSE 8000 8080

USER user

ADD assembly/assembly-main/target/eclipse-che-*/eclipse-che-* /home/user/che/

ENV CHE_HOME /home/user/che

ENTRYPOINT [ "/home/user/che/bin/che.sh", "-c" ]

CMD [ "run" ]
ENTRYPOINT ["/home/user/che/bin/docker.sh"]
6 changes: 6 additions & 0 deletions assembly/assembly-main/src/assembly/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@
</fileSet>
</fileSets>
<files>
<file>
<source>${project.basedir}/src/assembly/bin/docker.sh</source>
<outputDirectory>bin</outputDirectory>
<destName>docker.sh</destName>
<fileMode>755</fileMode>
</file>
<file>
<source>${project.basedir}/src/assembly/bin/che.sh</source>
<outputDirectory>bin</outputDirectory>
Expand Down
Loading