update builds for latest refactor

biosimulators · Nov 7, 2024 · e882ecf · e882ecf
1 parent 9bb3382
commit e882ecf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 77 deletions.
diff --git a/api/service/Dockerfile-api → api/Dockerfile-api b/api/service/Dockerfile-api → api/Dockerfile-api
@@ -8,18 +8,18 @@ FROM ghcr.io/biosimulators/bio-compose-server-base:0.0.5
 
 SHELL ["/usr/bin/env", "bash", "-c"]
 
-COPY .. .
+COPY . .
 
 EXPOSE 3001
 
 RUN source ~/.bashrc \
-    && conda env update -n server -f config/environment.api.yml \
+    && conda env update -n server -f environment.api.yml \
     && conda run pip install -e . --root-user-action=ignore \
     && conda env export --no-builds > config/environment.api.lock.yml \
     && rm -f spec/openapi_3_1_0_generated.yaml \
     && conda run python3 openapi_spec.py \
     && conda clean --all --json -y \
-    && rm -f config/environment.api.yml
+    && rm -f environment.api.yml
 
 # RUN source ~/.bashrc \
 #     && poetry install --without=composition,dev,worker --no-cache

diff --git a/api/config/env.api.yml b/api/config/env.api.yml
diff --git a/api/config/environment.api.yml → api/environment.api.yml b/api/config/environment.api.yml → api/environment.api.yml
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -13,8 +13,8 @@ services:
 
   api:
     build:
-      context: ./api/service
-      dockerfile: api/service/Dockerfile-api
+      context: ./api
+      dockerfile: Dockerfile-api
     image: bio-compose-server-api:0.0.1  # .9  ghcr.io/biosimulators/bio-check-compose_api:1.11.11  # .9
     container_name: api
     environment:
@@ -31,8 +31,8 @@ services:
 
   worker:
     build:
-      context: ./worker/service
-      dockerfile: worker/service/Dockerfile-worker
+      context: ./worker
+      dockerfile: Dockerfile-worker
     image: bio-compose-server-worker:0.0.1  # ghcr.io/biosimulators/bio-check-compose_worker:1.11.9  # .7
     container_name: worker
     environment:

diff --git a/worker/service/Dockerfile-worker → worker/Dockerfile-worker b/worker/service/Dockerfile-worker → worker/Dockerfile-worker
@@ -8,7 +8,7 @@ FROM ghcr.io/biosimulators/bio-compose-server-base:0.0.5
 
 SHELL ["/usr/bin/env", "bash", "-c"]
 
-COPY .. .
+COPY . .
 
 ENV TEST_SBML_FP="test_fixtures/Elowitz-Nature-2000-Repressilator/BIOMD0000000012_url.xml" \
     TEST_PSC_FP="/Pysces/psc/BIOMD0000000012_url.xml.psc" \
@@ -47,11 +47,11 @@ RUN source ~/.bashrc \
     libboost-chrono-dev \
     libboost-math-dev \
     libboost-serialization-dev \
-    && conda env update -n server -f config/environment.worker.yml \
+    && conda env update -n server -f environment.worker.yml \
     && conda run pip install -e . --root-user-action=ignore \
     && conda env export --no-builds > config/environment.worker.lock.yml \
     && conda clean --all --json -y \
-    && rm -f config/environment.worker.yml \
+    && rm -f environment.worker.yml \
     && rm -rf /var/lib/apt/lists/* \
     && apt-get autoremove -y \
     && apt-get clean

diff --git a/worker/config/environment.worker.yml → worker/environment.worker.yml b/worker/config/environment.worker.yml → worker/environment.worker.yml