Loading .gitlab-ci.yml +3 −10 Original line number Diff line number Diff line Loading @@ -168,12 +168,12 @@ build:python-build: CONTEXT_DIR: $CI_PROJECT_DIR/images/python-build needs: ["build:conda"] build:django: build:auth-service: extends: .docker-build stage: build-3 variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/django needs: ["build:conda"] CONTEXT_DIR: $CI_PROJECT_DIR/images/auth-service needs: ["build:python-build", "build:conda"] build:search: extends: .docker-build Loading @@ -188,10 +188,3 @@ build:thredds: variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/thredds needs: ["build:jdk", "build:tomcat"] build:auth-service: extends: .docker-build stage: build-4 variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/auth-service needs: ["build:python-build", "build:django"] images/auth-service/Dockerfile +40 −2 Original line number Diff line number Diff line Loading @@ -5,8 +5,46 @@ ARG ESGF_REPOSITORY_BASE=esgfdeploy ARG ESGF_IMAGES_VERSION=latest ARG GIT_REPOSITORY=https://github.com/cedadev/django-auth-service.git ARG GIT_VERSION=ff652b96d0b73639603f43b4770d0799ee886552 ARG GIT_VERSION=b5f8c31817a1373828470b0899265be69455a6ec FROM ${ESGF_REPOSITORY_BASE}/python-build:${ESGF_IMAGES_VERSION} as python-build FROM ${ESGF_REPOSITORY_BASE}/django:${ESGF_IMAGES_VERSION} FROM ${ESGF_REPOSITORY_BASE}/conda:${ESGF_IMAGES_VERSION} USER root # Install gunicorn server, whitenoise to handle static files and # django-flexi-settings for smart handling of settings RUN pip install --no-cache-dir \ 'gunicorn==20.0.4' \ 'django-flexi-settings==0.1.1' \ 'whitenoise==5.2.0' # Install gunicorn config file COPY gunicorn.conf.py /etc/gunicorn/conf.py COPY wsgi-serve.sh /usr/local/bin/ # Configure Django to use the flexi settings module ENV DJANGO_SETTINGS_MODULE flexi_settings.settings # Install the default settings ENV DJANGO_FLEXI_SETTINGS_ROOT /etc/django/settings.py COPY conf /etc/django # Make sure the settings directory exists RUN mkdir -p /etc/django/settings.d # Install init scripts and serving script COPY django-serve.sh /usr/local/bin/ COPY init.d/* /docker-init.d/ # Use ONBUILD instructions to install and configure the application COPY --from=python-build /build/wheelhouse /build/wheelhouse # Install the wheels that we copied RUN pip install --no-deps /build/wheelhouse/*.whl # Install the app settings COPY settings.d/* /etc/django/settings.d/ # Make sure to run as the ESGF user USER $ESGF_UID # By default, serve the Django application on port 8080 EXPOSE 8080 CMD ["/usr/local/bin/django-serve.sh"] images/django/conf/defaults.py→images/auth-service/conf/defaults.py +0 −0 File moved. View file images/django/conf/settings.py→images/auth-service/conf/settings.py +0 −0 File moved. View file images/django/conf/whitenoise.py→images/auth-service/conf/whitenoise.py +0 −0 File moved. View file Loading
.gitlab-ci.yml +3 −10 Original line number Diff line number Diff line Loading @@ -168,12 +168,12 @@ build:python-build: CONTEXT_DIR: $CI_PROJECT_DIR/images/python-build needs: ["build:conda"] build:django: build:auth-service: extends: .docker-build stage: build-3 variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/django needs: ["build:conda"] CONTEXT_DIR: $CI_PROJECT_DIR/images/auth-service needs: ["build:python-build", "build:conda"] build:search: extends: .docker-build Loading @@ -188,10 +188,3 @@ build:thredds: variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/thredds needs: ["build:jdk", "build:tomcat"] build:auth-service: extends: .docker-build stage: build-4 variables: CONTEXT_DIR: $CI_PROJECT_DIR/images/auth-service needs: ["build:python-build", "build:django"]
images/auth-service/Dockerfile +40 −2 Original line number Diff line number Diff line Loading @@ -5,8 +5,46 @@ ARG ESGF_REPOSITORY_BASE=esgfdeploy ARG ESGF_IMAGES_VERSION=latest ARG GIT_REPOSITORY=https://github.com/cedadev/django-auth-service.git ARG GIT_VERSION=ff652b96d0b73639603f43b4770d0799ee886552 ARG GIT_VERSION=b5f8c31817a1373828470b0899265be69455a6ec FROM ${ESGF_REPOSITORY_BASE}/python-build:${ESGF_IMAGES_VERSION} as python-build FROM ${ESGF_REPOSITORY_BASE}/django:${ESGF_IMAGES_VERSION} FROM ${ESGF_REPOSITORY_BASE}/conda:${ESGF_IMAGES_VERSION} USER root # Install gunicorn server, whitenoise to handle static files and # django-flexi-settings for smart handling of settings RUN pip install --no-cache-dir \ 'gunicorn==20.0.4' \ 'django-flexi-settings==0.1.1' \ 'whitenoise==5.2.0' # Install gunicorn config file COPY gunicorn.conf.py /etc/gunicorn/conf.py COPY wsgi-serve.sh /usr/local/bin/ # Configure Django to use the flexi settings module ENV DJANGO_SETTINGS_MODULE flexi_settings.settings # Install the default settings ENV DJANGO_FLEXI_SETTINGS_ROOT /etc/django/settings.py COPY conf /etc/django # Make sure the settings directory exists RUN mkdir -p /etc/django/settings.d # Install init scripts and serving script COPY django-serve.sh /usr/local/bin/ COPY init.d/* /docker-init.d/ # Use ONBUILD instructions to install and configure the application COPY --from=python-build /build/wheelhouse /build/wheelhouse # Install the wheels that we copied RUN pip install --no-deps /build/wheelhouse/*.whl # Install the app settings COPY settings.d/* /etc/django/settings.d/ # Make sure to run as the ESGF user USER $ESGF_UID # By default, serve the Django application on port 8080 EXPOSE 8080 CMD ["/usr/local/bin/django-serve.sh"]
