[DEP] fix deployment

ETH-NEXUS · Dec 7, 2023 · 087599d · 087599d
1 parent 2066920
commit 087599d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -118,11 +118,11 @@ services:
 In the `.env` you need to configure the following values:
 
 ```bash
-ENA_POSTGRES_HOST=db
-ENA_POSTGRES_PORT=5432
-ENA_POSTGRES_DB=ena
-ENA_POSTGRES_USER=ena
-ENA_POSTGRES_PASSWORD=b29a10670294502048c9
+POSTGRES_HOST=db
+POSTGRES_PORT=5432
+POSTGRES_DB=ena
+POSTGRES_USER=ena
+POSTGRES_PASSWORD=b29a10670294502048c9
 
 ENA_USERNAME=Webin-xxxxx
 ENA_PASSWORD=xxxxxxxxxxx

diff --git a/api/Dockerfile b/api/Dockerfile
@@ -6,21 +6,24 @@ ENV PIP_BREAK_SYSTEM_PACKAGES 1
 ENV PIP_DISABLE_PIP_VERSION_CHECK 1
 ENV DEBIAN_FRONTEND noninteractive
 
+# Set default env variables
+ENV DJANGO_SETTINGS_MODULE=ena_upload_ms.settings
+
 # Install the webin dependencies
-# RUN wget http://www.mirbsd.org/~tg/Debs/sources.txt/wtf-bookworm.sources
-# RUN mkdir -p /etc/apt/sources.list.d
-# RUN mv wtf-bookworm.sources /etc/apt/sources.list.d/
-# RUN apt-get update && apt-get install -y openjdk-8-jdk
-RUN mkdir -p /etc/apt/keyrings
-RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
-RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
-RUN apt-get update && apt-get install -y temurin-8-jdk
+RUN wget http://www.mirbsd.org/~tg/Debs/sources.txt/wtf-bookworm.sources
+RUN mkdir -p /etc/apt/sources.list.d
+RUN mv wtf-bookworm.sources /etc/apt/sources.list.d/
+RUN apt update && apt install -y openjdk-8-jdk
+# RUN mkdir -p /etc/apt/keyrings
+# RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc
+# RUN echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+# RUN apt update && apt install -y temurin-8-jdk
 RUN cd /opt && \
     wget https://github.com/enasequence/webin-cli/releases/download/6.7.2/webin-cli-6.7.2.jar && \
     mv webin-cli-6.7.2.jar webin-cli.jar
-RUN apt-get install -y rubygems
+RUN apt install -y rubygems
 RUN gem install aspera-cli
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt clean && rm -rf /var/lib/apt/lists/*
 
 # Global python requirements
 COPY ./requirements.txt /requirements.txt