diff --git a/Dockerfile b/Dockerfile index 5395bf5..d80fc6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -From ubuntu:trusty -MAINTAINER Elliott Ye +FROM ubuntu:focal # Set noninteractive mode for apt-get ENV DEBIAN_FRONTEND noninteractive @@ -9,10 +8,10 @@ RUN apt-get update # Start editing # Install package here for cache -RUN apt-get -y install supervisor postfix sasl2-bin opendkim opendkim-tools +RUN apt-get -y install postfix sasl2-bin opendkim opendkim-tools # Add files ADD assets/install.sh /opt/install.sh # Run -CMD /opt/install.sh;/usr/bin/supervisord -c /etc/supervisor/supervisord.conf +CMD /opt/install.sh;/opt/postfix.sh \ No newline at end of file diff --git a/assets/install.sh b/assets/install.sh index 0b2aaff..155a609 100755 --- a/assets/install.sh +++ b/assets/install.sh @@ -1,32 +1,17 @@ #!/bin/bash -#judgement -if [[ -a /etc/supervisor/conf.d/supervisord.conf ]]; then - exit 0 -fi - -#supervisor -cat > /etc/supervisor/conf.d/supervisord.conf <> /opt/postfix.sh <> /etc/opendkim/SigningTable <