public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updates in install scripts

Browse source
This commit is contained in:
root 2018-12-25 14:39:28 +01:00
parent 691b960ba5
commit edc8b54e8f
3 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
docker/Dockerfile
View file

@ -1,13 +1,22 @@
FROM node:8.6 FROM node:10.14-jessie
# First install dependencies # First install dependencies
COPY ../server/package.json ./app/ COPY ../server/package.json ./app/server
COPY ../client/package.json ./app/client
COPY ../shared/package.json ./app/shared
COPY ../zone-mta/package.json ./app/zone-mta
WORKDIR /app/ WORKDIR /app/
ENV NODE_ENV production ENV NODE_ENV production
RUN npm install --no-progress --production && npm install --no-progress passport-ldapjs passport-ldapauth
# Later, copy the app files. That improves development speed as buiding the Docker image will not have RUN for idx in client shared server zone-mta; do (cd $idx && npm install); done
# Later, copy the app files. That improves development speed as buiding the Docker image will not have
# to download and install all the NPM dependencies every time there's a change in the source code # to download and install all the NPM dependencies every time there's a change in the source code
COPY .. /app COPY .. /app
RUN cd client && npm run build
EXPOSE 3000 EXPOSE 3000
ENTRYPOINT ["bash", "/app/docker-entrypoint.sh"] ENTRYPOINT ["bash", "/app/docker/docker-entrypoint.sh"]
CMD ["node", "index.js"]

16
docker/docker-entrypoint.sh
View file

@ -1,18 +1,4 @@
#!/bin/bash #!/bin/bash
set -e set -e
if [ ! -f "/app/config/production.toml" ] ; then bash
echo "No production.toml, copying from docker-production.toml.tmpl"
cp /app/config/docker-production.toml.tmpl /app/config/production.toml
fi
if [ ! -f "/app/workers/reports/config/production.toml" ] ; then
echo "No production.toml for reports"
if [ -f "/app/config/production.toml" ] ; then
echo "copying config/production.toml to reports config directory"
cp /app/config/production.toml /app/workers/reports/config/production.toml
else
echo "copying config/docker-production.toml.tmpl to reports config directory as production.toml"
cp /app/config/docker-production.toml.tmpl /app/workers/reports/config/production.toml
fi
fi
exec "$@"

1
setup/functions
View file

@ -359,6 +359,7 @@ EOT
ubuntu1804) ubuntu1804)
a2enmod ssl a2enmod ssl
a2enmod rewrite
a2enconf mailtrain a2enconf mailtrain
systemctl restart apache2 systemctl restart apache2
;; ;;