Add VERSION & Update README.md (#94)

huan · Mar 9, 2021 · 745b7af · 745b7af
1 parent 0df7a6f
commit 745b7af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -71,6 +71,18 @@ jobs:
             --tag zixia/simple-mail-forwarder:latest \
             --push \
             .
+      -
+        name: 'Is A Publish Branch: Push README to Dockerhub'
+        if: steps.check-branch.outputs.match == 'true'
+        uses: christian-korneck/update-container-description-action@v1
+        env:
+          DOCKER_USER: zixia
+          DOCKER_PASS: ${{ secrets.DOCKER_PERSONAL_ACCESS_TOKEN }}
+        with:
+          destination_container_repo: zixia/simple-mail-forwarder
+          provider: dockerhub
+          short_description: 'Simplest and Smallest Email Forward Service'
+          readme_file: 'README.md'
       -
         name: Is Not A Publish Branch
         if: steps.check-branch.outputs.match != 'true'

diff --git a/Dockerfile b/Dockerfile
@@ -70,6 +70,7 @@ COPY entrypoint.sh /entrypoint.sh
 RUN bash -n /entrypoint.sh && chmod a+x /entrypoint.sh
 
 COPY BANNER /app/
+COPY VERSION /app/
 COPY test /app/test
 
 COPY .git/logs/HEAD /app/GIT_LOG

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -3,7 +3,7 @@ ARGV=$@
 
 function print_help {
 cat <<EOF
-                Docker SMF - Simple Mail Forwarder
+                Docker SMF v$(head -1 /app/VERSION) - Simple Mail Forwarder
 ===============================================================================
 To create a new mail server for your domain,
 you could use the following commands:
@@ -238,7 +238,7 @@ function start_postfix {
 
         echo "OpenDKIM: this TXT record for ${virtualDomain} should be present:"
         cat /var/db/dkim/${virtualDomain}/default.txt
-        
+
     done
 
     echo "Configuring DKIM key settings in /etc/opendkim/opendkim.conf"
@@ -247,16 +247,16 @@ function start_postfix {
     sed -e '/Domain/ s/^#*/#/' -i /etc/opendkim/opendkim.conf
 
     if ! grep -q -s "KeyTable" /etc/opendkim/opendkim.conf; then
-        echo "KeyTable /etc/opendkim/KeyTable" >> /etc/opendkim/opendkim.conf; 
+        echo "KeyTable /etc/opendkim/KeyTable" >> /etc/opendkim/opendkim.conf;
     fi
     if ! grep -q -s "SigningTable" /etc/opendkim/opendkim.conf; then
-        echo "SigningTable /etc/opendkim/SigningTable" >> /etc/opendkim/opendkim.conf; 
+        echo "SigningTable /etc/opendkim/SigningTable" >> /etc/opendkim/opendkim.conf;
     fi
     if ! grep -q -s "ExternalIgnoreList" /etc/opendkim/opendkim.conf; then
-        echo "ExternalIgnoreList /etc/opendkim/TrustedHosts" >> /etc/opendkim/opendkim.conf; 
+        echo "ExternalIgnoreList /etc/opendkim/TrustedHosts" >> /etc/opendkim/opendkim.conf;
     fi
     if ! grep -q -s "InternalHosts" /etc/opendkim/opendkim.conf; then
-        echo "InternalHosts /etc/opendkim/TrustedHosts" >> /etc/opendkim/opendkim.conf 
+        echo "InternalHosts /etc/opendkim/TrustedHosts" >> /etc/opendkim/opendkim.conf
     fi
 
     echo "Postfix main.cf custom entries from SMF_POSTFIXMAIN_"