Merge pull request #3020 from uw-it-aca/qa

email settings now in django-container, up minReplicas for reg peak (…

Author: fanglinfang

Dockerfile

@@ -1,5 +1,5 @@
-ARG DJANGO_CONTAINER_VERSION=1.4.1
-FROM gcr.io/uwit-mci-axdd/django-container:${DJANGO_CONTAINER_VERSION} as app-prewebpack-container
+ARG DJANGO_CONTAINER_VERSION=1.4.2
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-prewebpack-container
 
 USER root
 RUN apt-get update && apt-get install mysql-client libmysqlclient-dev -y
@@ -31,7 +31,7 @@ FROM app-prewebpack-container as app-container
 COPY --chown=acait:acait --from=node-bundler /app/myuw/static /app/myuw/static
 RUN /app/bin/python manage.py collectstatic --noinput
 
-FROM gcr.io/uwit-mci-axdd/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
+FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-test-container:${DJANGO_CONTAINER_VERSION} as app-test-container
 
 ENV NODE_PATH=/app/lib/node_modules
 COPY --from=app-container /app/ /app/

docker/prod-values.yml

@@ -1,6 +1,6 @@
 autoscaling:
   enabled: true
-  minReplicas: 3
+  minReplicas: 8
   maxReplicas: 80
 targetAverageUtilization: 100
 resources:

docker/settings.py

@@ -46,20 +46,6 @@
 
 MYUWCLASS = "https://eo.admin.uw.edu/uweomyuw/myuwclass/uwnetid/myuwclass.asp?cid="
 
-EMAIL_HOST = os.getenv("EMAIL_HOST")
-EMAIL_PORT = 587
-EMAIL_TIMEOUT = 15
-EMAIL_USE_TLS=True
-EMAIL_SSL_CERTFILE = os.getenv('CERT_PATH', '')
-EMAIL_SSL_KEYFILE = os.getenv('KEY_PATH', '')
-
-MAILMAN_COURSEREQUEST_RECIPIENT = os.getenv("MAILMAN_REQUEST_RECIPIENT")
-if os.getenv("ENV", "") == "prod":
-    EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-else:
-    EMAIL_BACKEND = "saferecipient.EmailBackend"
-    SAFE_EMAIL_RECIPIENT = os.getenv("SAFE_EMAIL_RECIPIENT")
-
 # uw_oidc settings
 if os.getenv("ENV", "") == "dev":
     UW_TOKEN_ISSUER = "https://idp-eval.u.washington.edu"