wip

thomasmckay · Aug 27, 2020 · 5da3dd3 · 5da3dd3
1 parent 77dba5b
commit 5da3dd3
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 31 deletions.
diff --git a/Dockerfile.centos7.osbs b/Dockerfile.centos7.osbs
@@ -50,9 +50,6 @@ RUN scl enable python36 "\
     PYTHONPATH=$QUAYPATH python -m external_libraries \
     "
 
-RUN cp -r $QUAYDIR/static/ldn $QUAYDIR/config_app/static/ldn && \
-    cp -r $QUAYDIR/static/fonts $QUAYDIR/config_app/static/fonts && \
-    cp -r $QUAYDIR/static/webfonts $QUAYDIR/config_app/static/webfonts
 
 # Check python dependencies for GPL
 # Due to the following bug, pip results must be piped to a file before grepping:

diff --git a/Dockerfile.osbs b/Dockerfile.osbs
@@ -55,9 +55,6 @@ RUN scl enable python36 "\
     PYTHONPATH=$QUAYPATH python -m external_libraries \
     "
 
-RUN cp -r $QUAYDIR/static/ldn $QUAYDIR/config_app/static/ldn && \
-    cp -r $QUAYDIR/static/fonts $QUAYDIR/config_app/static/fonts && \
-    cp -r $QUAYDIR/static/webfonts $QUAYDIR/config_app/static/webfonts
 
 # Check python dependencies for GPL
 # Due to the following bug, pip results must be piped to a file before grepping:

diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
@@ -55,9 +55,6 @@ RUN scl enable python36 "\
     PYTHONPATH=$QUAYPATH python -m external_libraries \
     "
 
-RUN cp -r $QUAYDIR/static/ldn $QUAYDIR/config_app/static/ldn && \
-    cp -r $QUAYDIR/static/fonts $QUAYDIR/config_app/static/fonts && \
-    cp -r $QUAYDIR/static/webfonts $QUAYDIR/config_app/static/webfonts
 
 # Check python dependencies for GPL
 # Due to the following bug, pip results must be piped to a file before grepping:

diff --git a/Dockerfile.rhel8 b/Dockerfile.rhel8
@@ -44,10 +44,7 @@ RUN alternatives --set python /usr/bin/python3 && \
     mkdir -p $QUAYDIR/static/webfonts && \
     mkdir -p $QUAYDIR/static/fonts && \
     mkdir -p $QUAYDIR/static/ldn && \
-    PYTHONPATH=$QUAYPATH python -m external_libraries && \
-    cp -r $QUAYDIR/static/ldn $QUAYDIR/config_app/static/ldn && \
-    cp -r $QUAYDIR/static/fonts $QUAYDIR/config_app/static/fonts && \
-    cp -r $QUAYDIR/static/webfonts $QUAYDIR/config_app/static/webfonts
+    PYTHONPATH=$QUAYPATH python -m external_libraries
 
 
 RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \

diff --git a/endpoints/api/discovery.py b/endpoints/api/discovery.py
@@ -1,4 +1,3 @@
-# TODO to extract the discovery stuff into a util at the top level and then use it both here and config_app discovery.py
 """
 API discovery information.
 """

diff --git a/local-config-app.sh b/local-config-app.sh