diff --git a/Dockerfile b/Dockerfile index e354b25..14073ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,35 +4,39 @@ MAINTAINER "Adam Thornton " ARG USER_NAME giftless USER root +# We need git to install the GitHub module RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ - apt-get install -y git make + apt-get install -y git # make (if you're rebuilding giftless) -# First, rebuild the image. The pypi tag is very stale and the released -# version does not work (but master does) -ARG SW=/opt/lsst/software -ARG V="0.5.1dev0" - -RUN mkdir -p $SW && \ - pip uninstall -y giftless && \ - rm -rf /app -RUN git clone https://github.com/datopian/giftless /app && \ - echo $V > /app/VERSION +# +# The following is what you need to do if you want to build Giftless from +# source. The state of flask/flask-classful/werkzeug is alarming. +# +#ARG V="0.5.1dev0" +#RUN pip uninstall -y giftless && \ +# rm -rf /app +#RUN git clone https://github.com/datopian/giftless /app && \ +# echo $V > /app/VERSION # This is from an issue that was never turned into a PR, even though the # issue contains the fix. IDK, man. -COPY patch/schema_hash_algo.diff /app -RUN cd /app && \ - patch -p1 < schema_hash_algo.diff - -RUN cd /app && \ - make requirements.txt && \ - pip install --upgrade --force-reinstall /app +#COPY patch/schema_hash_algo.diff /app +#RUN cd /app && \ +# patch -p1 < schema_hash_algo.diff +# +#RUN cd /app && \ +# make requirements.txt && \ +# pip install --upgrade --force-reinstall /app # Force flask/werkzeug -- don't know why requirements.txt doesn't. -RUN pip uninstall -y werkzeug flask flask-classful && \ - pip install --force-reinstall --no-dependencies \ - 'werkzeug==2.1.1' 'flask==2.1.3' 'flask-classful==0.15.0b1' +#RUN pip uninstall -y werkzeug flask flask-classful && \ +# pip install --force-reinstall --no-dependencies \ +# 'werkzeug==2.1.1' 'flask==2.1.3' 'flask-classful==0.15.0b1' + +ARG SW=/opt/lsst/software + +RUN mkdir -p $SW # Add Rubin GitHub proxy authenticator -ARG GPA=/opt/lsst/software/giftless-github-proxy-auth +ARG GPA=$SW/giftless-github-proxy-auth COPY . $GPA RUN pip install PyGitHub RUN pip install $GPA