Put the port directly in the dockerfile

The 'exec' form of CMD does not do variable substitution. There's no need to make the port number configurable, however.
SAEONData · Jun 10, 2020 · 6ad4b0f · 6ad4b0f
1 parent eb60ff0
commit 6ad4b0f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/deploy/core-services.yml b/deploy/core-services.yml
@@ -68,7 +68,6 @@ services:
       dockerfile: Dockerfile-${SERVER_ENV}
       args:
         - CA_CERT_URL=${ODP_ADMIN_URL}/ca.crt
-        - PORT=9999
     networks:
       - odp-core-net
     ports:

diff --git a/deploy/core-services/odp-admin-api/Dockerfile-development b/deploy/core-services/odp-admin-api/Dockerfile-development
@@ -17,5 +17,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-ARG PORT
-CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "${PORT}"]
+CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "9999"]
diff --git a/deploy/core-services/odp-admin-api/Dockerfile-production b/deploy/core-services/odp-admin-api/Dockerfile-production
@@ -17,5 +17,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-ARG PORT
-CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "${PORT}"]
+CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "9999"]
diff --git a/deploy/core-services/odp-admin-api/Dockerfile-staging b/deploy/core-services/odp-admin-api/Dockerfile-staging
@@ -17,5 +17,4 @@ ARG CA_CERT_URL
 RUN curl ${CA_CERT_URL} -k -f -o /usr/local/share/ca-certificates/saeon-internal-ca.crt; exit 0
 RUN update-ca-certificates
 
-ARG PORT
-CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "${PORT}"]
+CMD ["uvicorn", "accountsapi:app", "--host", "0.0.0.0", "--port", "9999"]