Develop

.gitlab-ci.yml

@@ -9,7 +9,9 @@ build_image:
   services:
     - docker:18.09.7-dind
   script:
-    - docker build -t $CI_REGISTRY_IMAGE .
+    - if [ "$CI_COMMIT_REF_NAME" == "master" ]; then TAG="latest"; else TAG="develop"; fi
+    - docker build -t $CI_REGISTRY_IMAGE:$TAG .
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE
+    - docker push $CI_REGISTRY_IMAGE:$TAG
+
 

httpd.conf

@@ -296,7 +296,7 @@ DocumentRoot "/usr/local/apache2/htdocs"
 # is requested.
 #
 <IfModule dir_module>
-    DirectoryIndex index.html
+    DirectoryIndex index.shtml
 </IfModule>
 
 #
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
 </IfModule>
 
 ProxyPreserveHost On
-ProxyPass /lexp/ http://lexp_service:8080/lex/
-ProxyPassReverse /lexp/ http://lexp_service:8080/lex/
\ No newline at end of file
+ProxyPass /lexp/ http://lexpservice:80/lex/
+ProxyPassReverse /lexp/ http://lexpservice:80/lex/

plwordnet/plwordnet.js

@@ -185,7 +185,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
         '<a href="/synsetid/plwordnet/' + element2.synset + '">' +
         '<p class="title">' + element2.lemma + '</p>' +
         '</a>' +
-        '<img width="40" height="20" class="img-responsive show-icon" src="http://lexp-dev.clarin-pl.eu/img/lang-' + lang + '-32.png" alt="Language" />' +
+        `<img width="40" height="20" class="img-responsive show-icon" src="/img/lang-${lang}-32.png" alt="Language" />` +
         definition +
         horizontalLine;
     });
@@ -195,7 +195,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
     let data =
     '<div class="plwordnet-box">' +
       '<h2>' +
-        '<img class="img-responsive show-icon" src="http://lexp-dev.clarin-pl.eu/img/lang-' + lang + '-32.png" alt="Language" />' +
+        '<img class="img-responsive show-icon" src="/img/lang-' + lang + '-32.png" alt="Language" />' +
         '<span lang="pl">' + title + ' (' + quantity + ')' + '</span>' +
         '<span lang="en">' + titleEn + ' (' + quantity + ')' + '</span>' +
       '</h2>' +
@@ -246,7 +246,7 @@ PlWordnet.prototype.showHTMLForSynset = function() {
         '<div class="fixed-space category"><span lang="pl">Słowo</span><span lang="en">Word</span></div>' +
         '<div class="fixed-space">' +
           '<h2 class="lemma">' + element.lemma + '</h2>' +
-          '<img class="img-responsive show-icon" src="http://lexp-dev.clarin-pl.eu/img/lang-' + language + '-32.png" alt="Language" />' +
+          '<img class="img-responsive show-icon" src="/img/lang-' + language + '-32.png" alt="Language" />' +
           '<p class="description">' + definition + '</p>' +
         '</div>' +
         '<hr />' +