diff options
author | 2018-04-11 11:57:44 +0000 | |
---|---|---|
committer | 2018-04-11 11:57:44 +0000 | |
commit | 07f670e35e420bf3e859faa076af9a5541d91d31 (patch) | |
tree | 5ea07ca7329e8b19f271fb9623a81a0f76f54cfc /deployment/docker | |
parent | ac243ea5d897b10a5bd123d40e4343aca08be498 (diff) | |
parent | 7e8d64ca08f544da2f2755290dd4725f442bcda9 (diff) |
Merge changes Ia439a8b7,Ia852017c,I4e185bc4,Ic476745d
* changes:
Docker: Strip off unwanted comments
Docker: Add COPY as part of RUN to improve layers
Docker: Combile all RUN into one sequence
Docker file env rearrange to one execution
Diffstat (limited to 'deployment/docker')
-rw-r--r-- | deployment/docker/src/main/docker/Dockerfile | 68 |
1 files changed, 25 insertions, 43 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index a01449d7..074bb164 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -1,55 +1,37 @@ FROM openjdk:8-jre-slim -#Setup default software -RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim +ENV OPEN_CLI_HOME=/opt/oclip \ + OPEN_CLI_DEBUG=false \ + OPEN_CLI_DEBUG_PORT=5005 \ + OPEN_CLI_MODE=console \ + OPEN_CLI_PRODUCT_IN_USE=open-cli \ + GOTTY_TITLE_FORMAT="{{ .command }}" -#Setup gotty -RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz && \ - tar -xvf go1.9.linux-amd64.tar.gz && mkdir -p /tmp/gotty && \ - GOPATH=/tmp/gotty /tmp/go/bin/go get github.com/yudai/gotty && \ - mv /tmp/gotty/bin/gotty /usr/sbin/ - -#Environments -ENV OPEN_CLI_HOME /opt/oclip -ENV OPEN_CLI_DEBUG false -ENV OPEN_CLI_DEBUG_PORT 5005 -ENV OPEN_CLI_MODE console -ENV OPEN_CLI_PRODUCT_IN_USE open-cli - -ENV GOTTY_TITLE_FORMAT {{ .command }} - -#Copy CLI into docker ADD ./STAGE $OPEN_CLI_HOME WORKDIR $OPEN_CLI_HOME -#Setup the run time environment (RTE) -#RTE: CLI -RUN chmod +x ./bin/oclip.sh && \ - ln ./bin/oclip.sh /usr/sbin/oclip && \ - if [ ! -d ./data ]; then mkdir ./data; fi && \ - if [ ! -d ./open-cli-schema ]; then mkdir ./open-cli-schema; fi - -#Create the readable README -RUN pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/oclip-readme.txt - -#RTE: lighttpd -COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf -COPY ./STAGE/http/web /var/www-data/servers/open-cli/ -COPY ./STAGE/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ -COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip +RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \ + cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz && \ + tar -xvf go1.9.linux-amd64.tar.gz && mkdir -p /tmp/gotty && \ + GOPATH=/tmp/gotty /tmp/go/bin/go get github.com/yudai/gotty && \ + mv /tmp/gotty/bin/gotty /usr/sbin/ && \ + pandoc -t plain $OPEN_CLI_HOME/docs/README.md > $OPEN_CLI_HOME/docs/oclip-readme.txt && \ + apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/* && \ + chmod +x $OPEN_CLI_HOME/bin/oclip.sh && \ + ln $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/oclip && \ + ln $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/onap && \ + if [ ! -d $OPEN_CLI_HOME/data ]; then mkdir $OPEN_CLI_HOME/data; fi && \ + if [ ! -d $OPEN_CLI_HOME/open-cli-schema ]; then mkdir $OPEN_CLI_HOME/open-cli-schema; fi && \ + if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi && \ + cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/ && \ + cp $OPEN_CLI_HOME/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf && \ + if [ ! -d /var/www-data/servers/open-cli/ ]; then mkdir -p /var/www-data/servers/open-cli/; fi && \ + cp $OPEN_CLI_HOME/http/web/*.* /var/www-data/servers/open-cli/ && \ + cp $OPEN_CLI_HOME/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ && \ + cp $OPEN_CLI_HOME/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip -RUN if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi -RUN cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/ EXPOSE 80 - -#RTE: gotty EXPOSE 8080 -#Start ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect oclip; else oclip -v && /bin/bash; fi - -#Cleanup -RUN apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/* - -RUN echo Open CLI docker successfully created !! |