Rename entrypoint script
This commit is contained in:
@@ -3,7 +3,7 @@ FROM python:3.6-alpine
|
||||
MAINTAINER Abhilash Raj
|
||||
|
||||
#Add startup script to container
|
||||
ADD assets/run.sh /opt/run.sh
|
||||
COPY docker-entrypoint.sh /usr/local/bin/
|
||||
|
||||
#Install all required packages, add user for executing mailman and set execution rights for startup script
|
||||
RUN apk update \
|
||||
@@ -12,8 +12,7 @@ RUN apk update \
|
||||
&& pip install psycopg2 mailman==3.1.0 mailman-hyperkitty==1.1.0 \
|
||||
&& pip install pymysql \
|
||||
&& apk del build-deps \
|
||||
&& adduser -S mailman \
|
||||
&& chmod a+x /opt/run.sh
|
||||
&& adduser -S mailman
|
||||
|
||||
# Change the working directory.
|
||||
WORKDIR /opt/mailman
|
||||
@@ -23,5 +22,5 @@ EXPOSE 8001 8024
|
||||
|
||||
ENV MAILMAN_CONFIG_FILE /etc/mailman.cfg
|
||||
|
||||
ENTRYPOINT ["/opt/run.sh"]
|
||||
CMD ["/usr/local/bin/master"]
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
CMD ["master"]
|
||||
|
||||
@@ -3,9 +3,9 @@ FROM python:2.7-alpine3.6
|
||||
MAINTAINER Abhilash Raj
|
||||
|
||||
# Add needed files for uwsgi server + settings for django
|
||||
ADD mailman-web /opt/mailman-web
|
||||
COPY mailman-web /opt/mailman-web
|
||||
# Add startup script to container
|
||||
ADD assets/run.sh /opt/run.sh
|
||||
COPY docker-entrypoint.sh /usr/local/bin/
|
||||
|
||||
# Install packages and dependencies for postorius and hyperkitty
|
||||
# Add user for executing apps, change ownership for uwsgi+django files and set execution rights for management script
|
||||
@@ -25,7 +25,6 @@ RUN set -ex \
|
||||
&& apk del --no-cache .build-deps \
|
||||
&& addgroup -S mailman \
|
||||
&& adduser -S -G mailman mailman \
|
||||
&& chmod u+x /opt/run.sh \
|
||||
&& chown -R mailman /opt/mailman-web/ \
|
||||
&& chmod u+x /opt/mailman-web/manage.py
|
||||
|
||||
@@ -37,5 +36,5 @@ EXPOSE 8000 8080
|
||||
# Use stop signal for uwsgi server
|
||||
STOPSIGNAL SIGINT
|
||||
|
||||
ENTRYPOINT ["/opt/run.sh"]
|
||||
ENTRYPOINT ["docker-entrypoint.sh"]
|
||||
CMD ["uwsgi", "--ini", "/opt/mailman-web/uwsgi.ini"]
|
||||
|
||||
Reference in New Issue
Block a user