Switched env var in compose-prod to fix certs.

ukaea · Aug 30, 2024 · e261e03 · e261e03
1 parent 77d4937
commit e261e03
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -145,18 +145,18 @@ mc cp --recursive <path-to-data> srv/mast
 To run the production container to start the postgres database, fastapi, and minio containers. This will also start an nginx proxy and make sure https is all setup
 
 ```bash
-docker-compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml up --build --force-recreate --remove-orphans -d
+docker compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml up --build --force-recreate --remove-orphans -d
 ```
 
 To shut down the production deployment, run the following command:
 
 ```bash
-docker-compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml down
+docker compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml down
 ```
 
 To also destory the volumes (including the metadatabase) you may add the volumes parameter:
 ```bash
-docker-compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml down --volumes
+docker compose --env-file dev/docker/.env.dev  -f dev/docker/docker-compose.yml -f dev/docker/docker-compose-prod.yml down --volumes
 ```
 
 Note that every time you destory volumes, the production server will mint a new certificate for HTTPS. Lets Encrypt currently limits this to [5 per week](https://letsencrypt.org/docs/duplicate-certificate-limit/)

diff --git a/dev/docker/api.Dockerfile b/dev/docker/api.Dockerfile
@@ -1,12 +1,11 @@
 FROM python:3.11
 WORKDIR /code
 
-ADD --chmod=755 https://astral.sh/uv/install.sh /install.sh
-RUN /install.sh && rm /install.sh
+RUN pip install uv
 
 COPY ./requirements.txt /code/requirements.txt
 
-RUN /root/.cargo/bin/uv pip install --system --no-cache -r /code/requirements.txt
+RUN uv pip install --system --no-cache -r /code/requirements.txt
 
 COPY ./src /code/src
 

diff --git a/dev/docker/docker-compose-prod.yml b/dev/docker/docker-compose-prod.yml
@@ -13,8 +13,10 @@ services:
       - DATABASE_HOST=pg_container
       - DATABASE_PORT=5432
       - VIRTUAL_HOST=mastapp.site
+      #- VIRTUAL_HOST=130.246.215.157
       - VIRTUAL_PORT=5000
       - LETSENCRYPT_HOST=mastapp.site
+      #- LETSENCRYPT_HOST=130.246.215.157
     networks:
       - dbnetwork
 

diff --git a/requirements.txt b/requirements.txt
@@ -31,3 +31,4 @@ xarray_datatree==0.0.12
 zarr==2.15.0
 httpx
 pint
+ujson