monkee.ch/cryptpad-docker
1
0
Fork 0
mirror of https://github.com/xwiki-labs/cryptpad-docker.git synced 2024-11-15 02:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #26 from xwiki-labs/installMethod

Browse source 
include an 'installMethod' property in server telemetry
This commit is contained in:
ansuz 2021-07-06 08:10:44 -04:00 committed by GitHub
commit d8ca1e7a64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -13,6 +13,7 @@ WORKDIR /cryptpad
COPY cryptpad /cryptpad COPY cryptpad /cryptpad
RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js
RUN sed -i "s@installMethod: 'unspecified'@installMethod: 'docker'@" /cryptpad/config/config.example.js
# Install dependencies # Install dependencies
RUN npm install --production \ RUN npm install --production \

1
Dockerfile-alpine
View file

@ -13,6 +13,7 @@ WORKDIR /cryptpad
COPY cryptpad /cryptpad COPY cryptpad /cryptpad
RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js RUN sed -i "s@//httpAddress: '::'@httpAddress: '0.0.0.0'@" /cryptpad/config/config.example.js
RUN sed -i "s@installMethod: 'unspecified'@installMethod: 'docker-alpine'@" /cryptpad/config/config.example.js
# Install dependencies # Install dependencies
RUN npm install --production \ RUN npm install --production \

2
docker-entrypoint.sh
View file

@ -71,7 +71,7 @@ if [ ! -f "${CPAD_NGINX_CPAD_CONF:=/etc/nginx/conf.d/cryptpad.conf}" ]; then
# Change nginx document root # Change nginx document root
sed -i "s@\(root\) */.*\([^;]\)@\1 $CPAD_HOME@" $CPAD_NGINX_CPAD_CONF sed -i "s@\(root\) */.*\([^;]\)@\1 $CPAD_HOME@" $CPAD_NGINX_CPAD_CONF
# Wether or not Nginx should terminate TLS (defaults to true) # Whether or not Nginx should terminate TLS (defaults to true)
if [ -n "$CPAD_TLS_CERT" \ if [ -n "$CPAD_TLS_CERT" \
-a -n "$CPAD_TLS_KEY" ]; then -a -n "$CPAD_TLS_KEY" ]; then