Browse Source

setup: fix module not installed

$ docker run -it --rm fphammerle/pyftpd-sink
Traceback (most recent call last):
  File "/home/ftp-sink/.local/bin/pyftpd-sink", line 7, in <module>
    from pyftpd_sink import main
ModuleNotFoundError: No module named 'pyftpd_sink'
Fabian Peter Hammerle 5 years ago
parent
commit
00fc024945
4 changed files with 4 additions and 4 deletions
  1. 1 1
      .dockerignore
  2. 1 1
      Dockerfile
  3. 0 0
      pyftpd_sink/__init__.py
  4. 2 2
      setup.py

+ 1 - 1
.dockerignore

@@ -1,4 +1,4 @@
 *
 !./.git
-!./pyftpd_sink.py
+!./pyftpd_sink
 !./setup.py

+ 1 - 1
Dockerfile

@@ -15,7 +15,7 @@ ENV FTP_PASSIVE_PORT 62121
 EXPOSE $FTP_CONTROL_PORT $FTP_PASSIVE_PORT
 
 COPY . /pyftpd-sink
-RUN pip install --user git+file:///pyftpd-sink#egg=pyftpd-sink
+RUN pip install --user --upgrade /pyftpd-sink
 
 # TODO set masquerade address for passive mode
 CMD ["pyftpd-sink", "--root-dir", "/sink"]

+ 0 - 0
pyftpd_sink.py → pyftpd_sink/__init__.py


+ 2 - 2
setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
     name='pyftpd-sink',
@@ -22,7 +22,7 @@ setup(
         'Topic :: System :: Systems Administration',
         'Topic :: Utilities',
     ],
-    packages=[],
+    packages=find_packages(),
     entry_points={
         'console_scripts': [
             'pyftpd-sink = pyftpd_sink:main',