Dockerfile tweak

macrostrat_db_insertion/Dockerfile

@@ -18,17 +18,18 @@ SHELL ["/bin/bash", "-c"]
 RUN conda init
 RUN source ~/.bashrc
 
-RUN mkdir /macrostrat_db_insertion
-COPY . /macrostrat_db_insertion
-WORKDIR /macrostrat_db_insertion
-
-# Add the macrostrat_db_insertion directory to PYTHONPATH
-ENV PYTHONPATH=/macrostrat_db_insertion
+WORKDIR /app
 
 # Create and activate conda environment
+COPY environment.yml environment.yml
 RUN conda env create -f environment.yml
 SHELL ["conda", "run", "-n", "db_insert_env", "/bin/bash", "-c"]
 
+COPY . ./macrostrat_db_insertion
+
+# Add the macrostrat_db_insertion directory to PYTHONPATH
+ENV PYTHONPATH=.
+
 # The code to run when the container is started
 EXPOSE 9543
-ENTRYPOINT ["conda", "run", "-n", "db_insert_env", "python3", "server.py"]
+ENTRYPOINT ["conda", "run", "-n", "db_insert_env", "python3", "macrostrat_db_insertion/server.py"]

macrostrat_db_insertion/environment.yml

@@ -7,20 +7,20 @@ dependencies:
   - ca-certificates=2024.3.11=h06a4308_0
   - cuda-version=11.6=h08688e6_2
   - ld_impl_linux-64=2.38=h1181459_1
-  - libffi=3.4.4=h6a678d5_0
+  - libffi
   - libgcc-ng=11.2.0=h1234567_1
   - libgomp=11.2.0=h1234567_1
   - libstdcxx-ng=11.2.0=h1234567_1
   - ncurses=6.4=h6a678d5_0
-  - openssl=3.0.13=h7f8727e_0
-  - pip=23.3.1=py39h06a4308_0
-  - python=3.9.19=h955ad1f_0
+  - openssl
+  - pip
+  - python=3.11
   - readline=8.2=h5eee18b_0
-  - setuptools=68.2.2=py39h06a4308_0
-  - sqlite=3.41.2=h5eee18b_0
-  - tk=8.6.12=h1ccaba5_0
+  - setuptools
+  - sqlite
+  - tk
   - tzdata=2024a=h04d1e81_0
-  - wheel=0.41.2=py39h06a4308_0
+  - wheel
   - xz=5.4.6=h5eee18b_0
   - zlib=1.2.13=h5eee18b_0
   - pip: