[library-web/oscp] library-web has to be fully built in order to work as expected even for the /search endpoint use cas



commit 22190db271c490b3fe4f7818cea231e1e7e392b9
Author: Andrea Veri <averi redhat com>
Date:   Thu Feb 13 21:09:56 2020 +0100

    library-web has to be fully built in order to work as expected even for the /search endpoint use case

 httpd/Dockerfile                                  | 8 ++++++--
 httpd/app_data/httpd-cfg/developer.gnome.org.conf | 4 ++--
 httpd/app_data/httpd-cfg/help.gnome.org.conf      | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/httpd/Dockerfile b/httpd/Dockerfile
index 9b8a606..3233a44 100644
--- a/httpd/Dockerfile
+++ b/httpd/Dockerfile
@@ -1,10 +1,14 @@
 FROM centos/httpd-24-centos7
 USER root
 
-RUN yum install -y python-html5lib git python2-django python27-mod_wsgi && \
+RUN yum install -y epel-release gnome-common glib2-devel intltool docbook-dtds \
+        docbook-style-xsl gtk-doc python-sqlite2 yelp-tools libxslt make git \
+        gnome-doc-utils-stylesheets && \
+    yum install -y python-html5lib python2-django python27-mod_wsgi && \
     yum -y clean all --enablerepo='*'
 
-RUN cd /opt/app-root/src && git clone https://gitlab.gnome.org/Infrastructure/library-web.git
+RUN git clone https://gitlab.gnome.org/Infrastructure/library-web.git /opt/lgo && \
+    cd /opt/lgo && ./autogen.sh && make -j2
 
 ADD developer.lgorc /opt/app-root/src
 
diff --git a/httpd/app_data/httpd-cfg/developer.gnome.org.conf 
b/httpd/app_data/httpd-cfg/developer.gnome.org.conf
index 0474c3b..6c3a8d6 100644
--- a/httpd/app_data/httpd-cfg/developer.gnome.org.conf
+++ b/httpd/app_data/httpd-cfg/developer.gnome.org.conf
@@ -11,7 +11,7 @@
     WSGIDaemonProcess developer
     WSGIProcessGroup developer
 
-    WSGIScriptAlias /symbols /opt/app-root/src/library-web/web/lgoweb.wsgi 
+    WSGIScriptAlias /symbols /opt/lgo/library-web/web/lgoweb.wsgi 
 
     # Bugzilla #689838
     RedirectMatch /gtk/(.*)$ /gtk3/$1
@@ -56,6 +56,6 @@
     Require all granted
 </Directory>
 
-<Directory "/opt/app-root/src/library-web/web">
+<Directory "/opt/lgo/library-web/web">
   Require all granted
 </Directory>
diff --git a/httpd/app_data/httpd-cfg/help.gnome.org.conf b/httpd/app_data/httpd-cfg/help.gnome.org.conf
index 2ac0c98..81d7ec6 100644
--- a/httpd/app_data/httpd-cfg/help.gnome.org.conf
+++ b/httpd/app_data/httpd-cfg/help.gnome.org.conf
@@ -9,7 +9,7 @@
     WSGIDaemonProcess library
     WSGIProcessGroup library
 
-    WSGIScriptAlias /symbols /opt/app-root/src/library-web/web/lgoweb.wsgi
+    WSGIScriptAlias /symbols /opt/lgo/library-web/web/lgoweb.wsgi
 
     RedirectPermanent /devel/ https://developer.gnome.org/
     RedirectPermanent /devel https://developer.gnome.org
@@ -42,6 +42,6 @@
     Require all granted
 </Directory>
 
-<Directory "/opt/app-root/src/library-web/web">
+<Directory "/opt/lgo/library-web/web">
   Require all granted
 </Directory>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]