Merge pull request #26 from AbcSxyZ/main-factoring

Create main function in entrypoint + rename entrypoint
dogecoin · Dec 4, 2021 · 335f326 · 335f326
2 parents 6e9d7b0 + 7a24a2d
commit 335f326
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/1.14.5/bullseye/Dockerfile b/1.14.5/bullseye/Dockerfile
@@ -84,8 +84,8 @@ RUN tar -xvf dogecoin.tar.gz --strip-components=1 \
     && chmod 4555 /usr/local/bin/dogecoin* \
     && rm -rf *
 
-COPY docker-entrypoint.py /usr/local/bin/docker-entrypoint
-RUN chmod 500 /usr/local/bin/docker-entrypoint
+COPY entrypoint.py /usr/local/bin/entrypoint.py
+RUN chmod 500 /usr/local/bin/entrypoint.py
 
 WORKDIR ${HOME}
 
@@ -97,5 +97,5 @@ EXPOSE 22555 44555 18332
 
 VOLUME ["/dogecoin/.dogecoin"]
 
-ENTRYPOINT ["docker-entrypoint"]
+ENTRYPOINT ["entrypoint.py"]
 CMD ["dogecoind"]
diff --git a/1.14.5/bullseye/docker-entrypoint.py → 1.14.5/bullseye/entrypoint.py b/1.14.5/bullseye/docker-entrypoint.py → 1.14.5/bullseye/entrypoint.py
@@ -130,7 +130,7 @@ def run_executable(executable, executable_args):
     #Run container command
     execute(executable, executable_args)
 
-if __name__ == "__main__":
+def main():
     if sys.argv[1].startswith("-"):
         executable = "dogecoind"
     else:
@@ -146,3 +146,6 @@ def run_executable(executable, executable_args):
     executable_args += sys.argv[1:]
 
     run_executable(executable, executable_args)
+
+if __name__ == "__main__":
+    main()