update docker file

openseespy-docker/.gitignore

@@ -1,2 +1,4 @@
 openseespy-pip
-opensees
+opensees
+*.pyd
+*.so

openseespy-docker/Dockerfile

@@ -21,7 +21,7 @@ FROM ubuntu-petsc AS ubuntu-openseespy
 ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /home
-COPY opensees /home/opensees
+RUN git clone https://github.com/zhuminjie/OpenSees.git opensees
 COPY Makefile.def /home/opensees/
 
 RUN mkdir /home/bin && \
@@ -36,12 +36,23 @@ RUN make -j python
 FROM ubuntu-openseespy AS ubuntu-pip
 
 # Build openseespy package
-COPY openseespy-pip /home/openseespy-pip/
+WORKDIR /home
+RUN git clone https://github.com/zhuminjie/OpenSeesPy.git openseespy
+
+# copy windows version
+# COPY opensees.pyd /home/openseespy/openseespy-pip/openseespy/opensees/linux
 
-WORKDIR /home/openseespy-pip
+# copy mac version
+# COPY opensees.so /home/openseespy/openseespy-pip/openseespy/opensees/mac
+
+WORKDIR /home/openseespy/openseespy-pip
 RUN python3.8 build_pip.py build \
-    ../opensees/SRC/interpreter/opensees.so \
+    ../../opensees/SRC/interpreter/opensees.so \
     copy_dep \
+    python3.8 no_zip
+
+# upload pip to test
+RUN python3.8 build_pip.py upload-test \
     python3.8
 ########################################################
 

openseespy-docker/build_docker.py

@@ -10,23 +10,9 @@ def build_docker(push=False):
     # change to script's folder
     os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
-    # openseespy-pip
-    if os.path.exists('openseespy-pip'):
-        print('removing openseespy-pip')
-        shutil.rmtree('openseespy-pip')
-
-    shutil.copytree('../openseespy-pip', 'openseespy-pip')
-
-    # opensees
-    if os.path.exists('opensees'):
-        print('removing opensees')
-        shutil.rmtree('opensees')
-
-    shutil.copytree('../opensees', 'opensees')
-
     # version
     about = {}
-    with open('openseespy-pip/openseespy/version.py') as fp:
+    with open('../openseespy-pip/openseespy/version.py') as fp:
         exec(fp.read(), about)
     version = about['version']
 
@@ -40,24 +26,24 @@ def build_docker(push=False):
     subprocess.run(['docker',
                     'build', '--target', 'ubuntu-pip',
                     '-t', f'ubuntu-pip:{version}', '.'])
-    subprocess.run(['docker',
-                    'build', '--target', 'ubuntu-install',
-                    '-t', f'zhuminjie/openseespy:{version}', '.'])
-    subprocess.run(['docker',
-                    'build', '--target', 'ubuntu-notebook',
-                    '-t', f'zhuminjie/openseespy:{version}-notebook', '.'])
+    # subprocess.run(['docker',
+    #                 'build', '--target', 'ubuntu-install',
+    #                 '-t', f'zhuminjie/openseespy:{version}', '.'])
+    # subprocess.run(['docker',
+    #                 'build', '--target', 'ubuntu-notebook',
+    #                 '-t', f'zhuminjie/openseespy:{version}-notebook', '.'])
 
-    if push:
-        subprocess.run(['docker', 'login'])
-        subprocess.run(['docker', 'image',
-                        'push', tag_openseespy])
-        subprocess.run(['docker', 'image',
-                        'push', tag_notebook])
+    # if push:
+    #     subprocess.run(['docker', 'login'])
+    #     subprocess.run(['docker', 'image',
+    #                     'push', tag_openseespy])
+    #     subprocess.run(['docker', 'image',
+    #                     'push', tag_notebook])
 
 
 if __name__ == "__main__":
     push = False
     for i in range(1, len(sys.argv)):
-        if sys.argv[i] == '-push':
+        if sys.argv[i] == 'push':
             push = True
     build_docker(push)

openseespy-pip/build_pip.py

@@ -73,11 +73,6 @@ def copy_mac_library(so):
 
 def build_pip(pyexe='python', use_zip=False):
 
-    print('==============================================================')
-    print('Did you remember to update version number in opensees source?')
-    print('\n\n\n\n\n')
-    print('==============================================================')
-
     # clean folders
     subprocess.run(['rm', '-fr', 'build', 'dist', 'openseespy.egg-info'])
 
@@ -127,7 +122,7 @@ def install_pip(pyexe='python'):
 
     if sys.argv[1] == 'build':
         if len(sys.argv) < 6:
-            print('buld_pip build so copy_dep/no_copy pyexe use_zip')
+            print('buld_pip build so copy_dep/no_copy pyexe use_zip/no_zip')
             exit()
 
         so = sys.argv[2]

update_version.py

@@ -31,14 +31,9 @@ def update_version(version):
     subprocess.run(['git', 'commit', '-m',
                     f'update version {version}'])
 
-    # update docker image
-    subprocess.run(['python3.8',
-                    'openseespy-docker/build_docker.py'])
-
     # push to github
     subprocess.run(['git', 'push'])
 
-
 if __name__ == '__main__':
 
     if len(sys.argv) < 2: