Commit 57a396ac authored by William Tucker's avatar William Tucker
Browse files

Removed unused build hooks for Django image

parent d4cc8f88
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
ARG ESGF_REPOSITORY_BASE=esgfdeploy
ARG ESGF_IMAGES_VERSION=latest
ARG GIT_REPOSITORY=https://github.com/cedadev/django-auth-service.git
ARG GIT_VERSION=c0befb6001c813050dbc8e3ca503cd1c7c22f7f0
ARG GIT_VERSION=ff652b96d0b73639603f43b4770d0799ee886552

FROM ${ESGF_REPOSITORY_BASE}/python-build:${ESGF_IMAGES_VERSION} as python-build

+0 −9
Original line number Diff line number Diff line
@@ -39,18 +39,9 @@ EXPOSE 8080
CMD ["/usr/local/bin/django-serve.sh"]

# Use ONBUILD instructions to install and configure the application
#   Copy any specified hooks into the image
#   Because we need this to work even if there are no hooks, we must also include
#   a file that is guaranteed to be in the context, so we use the Dockerfile
ONBUILD COPY Dockerfile hooks/* /etc/django/hooks/
#   If there is a pre-install hook, run it
ONBUILD RUN [ ! -x /etc/django/hooks/pre-install ] || /etc/django/hooks/pre-install
#   Copy the wheels from the python-build stage
ONBUILD COPY --from=python-build /build/wheelhouse /build/wheelhouse
#   Install the wheels that we copied
ONBUILD RUN pip install --no-deps /build/wheelhouse/*.whl
#   If there is a post-install hook, run it
ONBUILD RUN [ ! -x /etc/django/hooks/post-install ] || /etc/django/hooks/post-install
#   Install the app settings
ONBUILD COPY settings.d/* /etc/django/settings.d/
#   Make sure to run as the ESGF user
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder

# Unpack the THREDDS war
ARG THREDDS_VERSION=5.5
ARG THREDDS_SHA1=8b04107353f49e47ec882ebd4752ab2785ca0251
ARG THREDDS_SHA1=148e7745edcdabaf42ff4af6a02ceb1fc4bb9bbd
ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war
RUN mkdir /application && \
    cd /application && \