From d197206ec89abc53fc5b1533db855ad6712d0cc7 Mon Sep 17 00:00:00 2001 From: w2 Date: Sat, 1 Jan 2022 06:22:11 +0000 Subject: [PATCH] fix: openapi docs path --- Dockerfile.photovoter-backend | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Dockerfile.photovoter-backend b/Dockerfile.photovoter-backend index 1dead83..8a84894 100644 --- a/Dockerfile.photovoter-backend +++ b/Dockerfile.photovoter-backend @@ -2,8 +2,11 @@ FROM pythonmagick ARG BACKEND_LOCATION="/opt" ARG DATA_LOCATION="/srv/photovoter" -ARG USERNAME="changeme" -ARG USERPASS="CHANGEME" + +# Move these lower to avoid excessive rebuilds +#ARG USERNAME="changeme" +#ARG USERPASS="CHANGEME" +#ARG DOMAIN="gman.me" ENV BACKEND_LOCATION=${BACKEND_LOCATION} @@ -26,13 +29,21 @@ RUN cd $BACKEND_LOCATION && \ RUN apt-get remove --autoremove --purge -y gcc python3-dev && \ rm -rf /var/lib/apt/lists/* + + +ARG USERNAME="changeme" +ARG USERPASS="CHANGEME" +ARG DOMAIN="gman.me" # Configure backend RUN sed --in-place \ --expression 's#DATA_LOCATION = "/tmp/123"#DATA_LOCATION = "'$DATA_LOCATION'"#' \ --expression 's#"testbox/photovoter.dblite"#"'$DATA_LOCATION'/photovoter.dblite"#' \ - --expression 's#CRED_USERNAME = "changeme"#CRED_USERNAME = "'$USERNAME'"#' \ - --expression 's#CRED_PASSWORD = "CHANGEME"#CRED_PASSWORD = "'$USERPASS'"#' \ - $BACKEND_LOCATION/photovoter_backend/config.py + --expression 's#CRED_USERNAME = "changeme"#CRED_USERNAME = "'$USERNAME'"#' \ + --expression 's#CRED_PASSWORD = "CHANGEME"#CRED_PASSWORD = "'$USERPASS'"#' \ + $BACKEND_LOCATION/photovoter_backend/config.py && \ + sed --in-place \ + --expression "s#app = FastAPI()#app = FastAPI(servers=[{'url': 'http://$DOMAIN/api/v1'}])#" \ + $BACKEND_LOCATION/photovoter_backend/main.py