Cleanup Dockerfile, thanks to @kpcyrd

This commit is contained in:
Thomas Gläßle 2017-04-09 11:36:33 +02:00
parent c182a407cf
commit 2985c6a051
2 changed files with 11 additions and 26 deletions

View File

@ -1,28 +1,13 @@
FROM node:6 FROM node:6-alpine
ARG VERSION=0.3.0
# Download stable version
# RUN wget https://github.com/xwiki-labs/cryptpad/archive /${VERSION}.tar.gz -O /cryptpad.tar.gz \
# && mkdir -p /cryptpad \
# && tar -xzf /cryptpad.tar.gz -C /cryptpad --strip-components=1 \
# && rm /cryptpad.tar.gz
# Download from github
# RUN git clone https://github.com/xwiki-labs/cryptpad.git
# Add code directly
ADD . /cryptpad
COPY . /cryptpad
WORKDIR /cryptpad WORKDIR /cryptpad
RUN npm install \ RUN apk add --no-cache git tini \
&& npm install \
&& npm install -g bower \ && npm install -g bower \
&& bower install --allow-root && bower install --allow-root
ADD container-start.sh /container-start.sh
RUN chmod u+x /container-start.sh
EXPOSE 3000 EXPOSE 3000
VOLUME /cryptpad/datastore VOLUME /cryptpad/datastore
@ -32,4 +17,4 @@ ENV USE_SSL=false
ENV STORAGE='./storage/file' ENV STORAGE='./storage/file'
ENV LOG_TO_STDOUT=true ENV LOG_TO_STDOUT=true
CMD /container-start.sh CMD ["/sbin/tini", "--", "/cryptpad/container-start.sh"]

12
container-start.sh Normal file → Executable file
View File

@ -1,22 +1,22 @@
#!/bin/bash #!/bin/sh
# Creating customize folder # Creating customize folder
mkdir -p customize mkdir -p customize
[[ ! "$(ls -A customize)" ]] && echo "Creating customize folder" \ [ -z "$(ls -A customize)" ] && echo "Creating customize folder" \
&& cp -R customize.dist/* customize/ \ && cp -R customize.dist/* customize/ \
&& cp config.js.dist customize/config.js && cp config.js.dist customize/config.js
# Linking config.js # Linking config.js
[[ ! -h config.js ]] && echo "Linking config.js" && ln -s customize/config.js config.js [ ! -h config.js ] && echo "Linking config.js" && ln -s customize/config.js config.js
# Configure # Configure
[[ -n "$USE_SSL" ]] && echo "Using secure websockets: $USE_SSL" \ [ -n "$USE_SSL" ] && echo "Using secure websockets: $USE_SSL" \
&& sed -i "s/useSecureWebsockets: .*/useSecureWebsockets: ${USE_SSL},/g" customize/config.js && sed -i "s/useSecureWebsockets: .*/useSecureWebsockets: ${USE_SSL},/g" customize/config.js
[[ -n "$STORAGE" ]] && echo "Using storage adapter: $STORAGE" \ [ -n "$STORAGE" ] && echo "Using storage adapter: $STORAGE" \
&& sed -i "s/storage: .*/storage: ${STORAGE},/g" customize/config.js && sed -i "s/storage: .*/storage: ${STORAGE},/g" customize/config.js
[[ -n "$LOG_TO_STDOUT" ]] && echo "Logging to stdout: $LOG_TO_STDOUT" \ [ -n "$LOG_TO_STDOUT" ] && echo "Logging to stdout: $LOG_TO_STDOUT" \
&& sed -i "s/logToStdout: .*/logToStdout: ${LOG_TO_STDOUT},/g" customize/config.js && sed -i "s/logToStdout: .*/logToStdout: ${LOG_TO_STDOUT},/g" customize/config.js