diff --git a/backend/.vscode/launch.json b/backend/.vscode/launch.json index 9d720aa..aadf76d 100644 --- a/backend/.vscode/launch.json +++ b/backend/.vscode/launch.json @@ -14,7 +14,6 @@ "PREFECT_LOGGING_LEVEL": "DEBUG", "MINIO_ENDPOINT": "scopem-openemdata.ethz.ch:9090", "MINIO_EXTERNAL_ENDPOINT": "scopem-openemdata.ethz.ch:9090", - "AWS_CA_BUNDLE": "/etc/ssl/certs/ca-certificates.crt", "LTS_STORAGE_ROOT": "/tmp/data/LTS/", "LTS_FREE_SPACE_PERCENTAGE": "0.2", "ARCHIVER_SCRATCH_FOLDER": "/tmp/data/scratch/", diff --git a/backend/api/.vscode/launch.json b/backend/api/.vscode/launch.json index 88c6ef3..6aa2c5f 100644 --- a/backend/api/.vscode/launch.json +++ b/backend/api/.vscode/launch.json @@ -12,7 +12,6 @@ "PREFECT_API_URL": "http://localhost:4200/api", "PREFECT_LOGGING_LEVEL": "DEBUG", "MINIO_ENDPOINT": "scopem-openemdata.ethz.ch:9090", - "AWS_CA_BUNDLE": "/etc/ssl/certs/ca-certificates.crt", "SECRETS_DIR": "${workspaceFolder}/../../.secrets", "UVICORN_ROOT_PATH": "", "UVICORN_RELOAD": "true", diff --git a/backend/api/Dockerfile b/backend/api/Dockerfile index ececb5a..3659daa 100644 --- a/backend/api/Dockerfile +++ b/backend/api/Dockerfile @@ -32,10 +32,4 @@ WORKDIR /root/app/site-packages COPY --from=builder /venv /venv ENV PATH=/venv/bin:$PATH -RUN wget https://cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem -O DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt -RUN cp DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt /usr/local/share/ca-certificates/ -RUN update-ca-certificates - -ENV AWS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - ENTRYPOINT [ "python", "-m", "openapi_server" ] diff --git a/backend/archiver/tests/test_e2e.py b/backend/archiver/tests/test_e2e.py index 997543e..6ba6a7c 100644 --- a/backend/archiver/tests/test_e2e.py +++ b/backend/archiver/tests/test_e2e.py @@ -78,7 +78,6 @@ def set_env(): envs = { 'PREFECT_SERVER_URL': PREFECT_SERVER_URL, - "AWS_CA_BUNDLE": "/etc/ssl/certs/ca-certificates.crt", } for k, v in envs.items(): diff --git a/backend/prefect-runtime.Dockerfile b/backend/prefect-runtime.Dockerfile index 666b24b..f3c195e 100644 --- a/backend/prefect-runtime.Dockerfile +++ b/backend/prefect-runtime.Dockerfile @@ -27,11 +27,5 @@ COPY ./backend/ ./ COPY ./backend/archiver/Pipfile ./ COPY ./backend/archiver/Pipfile.lock ./ -RUN wget https://cacerts.digicert.com/DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt.pem -O DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt -RUN cp DigiCertGlobalG2TLSRSASHA2562020CA1-1.crt /usr/local/share/ca-certificates/ -RUN update-ca-certificates - -ENV AWS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --system --deploy CMD ["/bin/bash"] \ No newline at end of file