diff --git a/DockerfileHttps b/DockerfileHttps index dfe2891..aa5453e 100644 --- a/DockerfileHttps +++ b/DockerfileHttps @@ -14,7 +14,3 @@ COPY ./app /code/app # run server CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "443", "--ssl-keyfile=./app/certs/privkey3.pem", "--ssl-certfile=./app/certs/cert3.pem"] - -# "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "443", "--ssl-keyfile=./certs/privkey.pem", "--ssl-certfile=./certs/cert.pem" -# make it a bash command -# uvicorn app.main:app --host "0.0.0.0" --port 443 --ssl-keyfile=./app/certs/privkey3.pem --ssl-certfile=./app/certs/cert3.pem diff --git a/build-debug.bash b/build-debug.bash index b449511..b62351b 100755 --- a/build-debug.bash +++ b/build-debug.bash @@ -1,16 +1,11 @@ git pull -## This step should be removed... issue is documented here: -## https://github.com/linomp/no-pasaran-backend/issues/1 -#cp /etc/letsencrypt/live/apps.xmp.systems/cert.pem app/cert.pem -#cp /etc/letsencrypt/live/apps.xmp.systems/privkey.pem app/privkey.pem -#chmod 777 app/cert.pem -#chmod 777 app/privkey.pem - docker container stop devtest docker container rm devtest docker image rm pointless-backend-debug docker build -t pointless-backend-debug -f DockerfileDebug . -docker run -it --name devtest -p 8080:8080 -p 8443:8443 -v /etc/letsencrypt/archive/apps.xmp.systems:/code/app/certs:ro pointless-backend-debug +docker run -it --name devtest -p 443:443 -v /etc/letsencrypt/archive/apps.xmp.systems:/code/app/certs:ro pointless-backend-debug + +# uvicorn app.main:app --host "0.0.0.0" --port 443 --ssl-keyfile=./app/certs/privkey3.pem --ssl-certfile=./app/certs/cert3.pem diff --git a/build-http.bash b/build-http.bash deleted file mode 100755 index 76b46a2..0000000 --- a/build-http.bash +++ /dev/null @@ -1,9 +0,0 @@ -git pull - -docker container stop no-pasaran-backend-http -docker container rm no-pasaran-backend-http - -docker image rm no-pasaran-backend-http -docker build -t no-pasaran-backend-http -f DockerfileHttp . - -docker run -d --name no-pasaran-backend-http -p 80:80 no-pasaran-backend-http \ No newline at end of file diff --git a/build-https.bash b/build-https.bash deleted file mode 100755 index 4489ba7..0000000 --- a/build-https.bash +++ /dev/null @@ -1,16 +0,0 @@ -git pull - -# This step should be removed... issue is documented here: -# https://github.com/linomp/no-pasaran-backend/issues/1 -cp /etc/letsencrypt/live/apps.xmp.systems/cert.pem app/cert.pem -cp /etc/letsencrypt/live/apps.xmp.systems/privkey.pem app/privkey.pem -chmod 777 app/cert.pem -chmod 777 app/privkey.pem - -docker container stop no-pasaran-backend-https -docker container rm no-pasaran-backend-https - -docker image rm no-pasaran-backend-https -docker build -t no-pasaran-backend-https -f DockerfileHttps . - -docker run -d --name no-pasaran-backend-https -p 443:443 no-pasaran-backend-https \ No newline at end of file