Revert "Fixed pages for docker-compose"

This reverts commit 45cebeb571.

Dockerfile

@@ -8,7 +8,7 @@ RUN bundle install
 FROM jekyll/jekyll
 
 VOLUME /src
-EXPOSE 4001
+EXPOSE 4000
 
 WORKDIR /src
 ENTRYPOINT ["jekyll", "serve", "--livereload", "-H", "0.0.0.0"]

_config.yml

@@ -30,7 +30,7 @@ google_analytics:
 host: 127.0.0.1
 # the preview server used. Leave as is.
 
-port: 4001
+port: 4000
 # the port where the preview is rendered. You can leave this as is unless you have other Jekyll builds using this same port that might cause conflicts. in that case, use another port such as 4006.
 
 exclude:

_includes/footer.html

@@ -3,7 +3,7 @@
                 <div class="col-lg-12 footer">
                &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
 {% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }} <br />
-<p><img style="margin-top: 1em;" src="{{ "/images/psi-logo.png" | prepend: site.baseurl | prepend: site.url}}" alt="PSI logo"/></p>
+<p><img style="margin-top: 1em;" src="{{ "/images/psi-logo.png"}}" alt="PSI logo"/></p>
                 </div>
             </div>
 </footer>

_includes/head.html

@@ -4,35 +4,34 @@
 <meta name="description" content="{% if page.summary %}{{ page.summary | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
 <meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
 <title>{{ page.title }} | {{ site.site_title }}</title>
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url}}">
+<link rel="stylesheet" href="{{ "/css/syntax.css"}}">
 
 <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<!--<link rel="stylesheet" type="text/css" href="{{ "/css/bootstrap.min.css"| prepend: site.baseurl | prepend: site.url }}">-->
+<!--<link rel="stylesheet" type="text/css" href="{{ "/css/bootstrap.min.css"}}">-->
-<link rel="stylesheet" href="{{ "/css/modern-business.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/modern-business.css"}}">
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-<link rel="stylesheet" href="{{ "/css/customstyles.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/customstyles.css"}}">
-<link rel="stylesheet" href="{{ "/css/boxshadowproperties.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/boxshadowproperties.css"}}">
 <!-- most color styles are extracted out to here -->
-<link rel="stylesheet" href="{{ "/css/theme-blue.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css"}}">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
-<script src="{{ "/js/jquery.navgoco.min.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/jquery.navgoco.min.js"}}"></script>
 
 
 <!-- Latest compiled and minified JavaScript -->
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 <!-- Anchor.js -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.2.0/anchor.min.js"></script>
-<script src="{{ "/js/toc.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/toc.js"}}"></script>
-<script src="{{ "/js/customscripts.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/customscripts.js"}}"></script>
 
-<link rel="apple-touch-icon" sizes="180x180"    href="{{ "/apple-touch-icon.png"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ "/favicon-32x32.png"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ "/favicon-16x16.png"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-<link rel="shortcut icon" href="{{ "/favicon.ico"| prepend: site.baseurl | prepend: site.url }}">
 
 <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

_includes/head_print.html

@@ -6,14 +6,14 @@
 <title>{% if page.homepage == true %} {{site.homepage_title}} {% elsif page.title %}{{ page.title }}{% endif %}  | {{ site.site_title }}</title>
 
 
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/syntax.css" }}">
-<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" }}">
-<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" }}">
-<link rel="stylesheet" href="{{ "/css/modern-business.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/modern-business.css" }}">
-<link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/customstyles.css" }}">
-<link rel="stylesheet" href="{{ "/css/theme-blue.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css" }}">
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/syntax.css" }}">
-<link rel="stylesheet" href="{{ "/css/printstyles.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ "/css/printstyles.css" }}">
 
 <script>
     Prince.addScriptFunc("datestamp", function() {

_includes/image.html

@@ -1 +1 @@
-<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
+<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ "/images/"}}{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>

_includes/inline_image.html

@@ -1 +1 @@
-<img class="inline" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" />
+<img class="inline" src="{{ "/images/"}}{{include.file}}" alt="{{include.alt}}" />

_includes/sidebar.html

@@ -16,12 +16,12 @@
           {% if folderitem.external_url %}
           <li><a title="{{folderitem.title}}" href="{{folderitem.external_url}}" target="_blank" rel="noopener">{{folderitem.title}}</a></li>
           {% elsif page.url contains folderitem.url %}
-          <li class="active"><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
+          <li class="active"><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
           {% elsif folderitem.type == "empty" %}
-          <li><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
+          <li><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
 
           {% else %}
-          <li><a title="{{folderitem.title}}" href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
+          <li><a title="{{folderitem.title}}" href="{{folderitem.url}}">{{folderitem.title}}</a></li>
           {% endif %}
           {% for subfolders in folderitem.subfolders %}
           {% if subfolders.output == nil or subfolders.output contains "web" %}
@@ -33,9 +33,9 @@
                   {% if subfolderitem.external_url %}
                   <li><a title="{{subfolderitem.title}}" href="{{subfolderitem.external_url}}" target="_blank" rel="noopener">{{subfolderitem.title}}</a></li>
                   {% elsif page.url == subfolderitem.url %}
-                  <li class="active"><a title="{{subfolderitem.title}}" href="{{subfolderitem.url | relative_url}}">{{subfolderitem.title}}</a></li>
+                  <li class="active"><a title="{{subfolderitem.title}}" href="{{subfolderitem.url}}">{{subfolderitem.title}}</a></li>
                   {% else %}
-                  <li><a title="{{subfolderitem.title}}" href="{{subfolderitem.url | relative_url }}">{{subfolderitem.title}}</a></li>
+                  <li><a title="{{subfolderitem.title}}" href="{{subfolderitem.url }}">{{subfolderitem.title}}</a></li>
                   {% endif %}
                   {% endif %}
                   {% endfor %}

_includes/topnav.html

@@ -8,7 +8,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" | relative_url }}">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
+            <a class="fa fa-home fa-lg navbar-brand" href="{{ "/index.html" }}">&nbsp;<span class="projectTitle"> {{site.topnav_title}}</span></a>
         </div>
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav navbar-right">
@@ -24,9 +24,9 @@
                 {% if item.external_url %}
                 <li><a href="{{item.external_url}}" target="_blank" rel="noopener">{{item.title}}</a></li>
                 {% elsif page.url contains item.url %}
-                <li class="active"><a href="{{item.url | relative_url }}">{{item.title}}</a></li>
+                <li class="active"><a href="{{item.url }}">{{item.title}}</a></li>
                 {% else %}
-                <li><a href="{{item.url | relative_url}}">{{item.title}}</a></li>
+                <li><a href="{{item.url}}">{{item.title}}</a></li>
                 {% endif %}
                 {% endfor %}
                 {% endfor %}
@@ -41,9 +41,9 @@
                         {% if folderitem.external_url %}
                         <li><a href="{{folderitem.external_url}}" target="_blank" rel="noopener">{{folderitem.title}}</a></li>
                         {% elsif page.url contains folderitem.url %}
-                        <li class="dropdownActive"><a href="{{folderitem.url | relative_url}}">{{folderitem.title}}</a></li>
+                        <li class="dropdownActive"><a href="{{folderitem.url}}">{{folderitem.title}}</a></li>
                         {% else %}
-                        <li><a href="{{folderitem.url | relative_url }}">{{folderitem.title}}</a></li>
+                        <li><a href="{{folderitem.url }}">{{folderitem.title}}</a></li>
                         {% endif %}
                         {% endfor %}
                     </ul>
@@ -60,12 +60,12 @@
                         <input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
                         <ul id="results-container"></ul>
                     </div>
-                    <script src="{{ "/js/jekyll-search.js"| prepend: site.baseurl | prepend: site.url }}" type="text/javascript"></script>
+                    <script src="{{ "/js/jekyll-search.js"}}" type="text/javascript"></script>
                     <script type="text/javascript">
                             SimpleJekyllSearch.init({
                                 searchInput: document.getElementById('search-input'),
                                 resultsContainer: document.getElementById('results-container'),
-                                dataSource: '{{ "/search.json"| prepend: site.baseurl | prepend: site.url }}',
+                                dataSource: '{{ "/search.json"}}',
                                 searchResultTemplate: '<li><a href="{url}" title="{{page.title | escape }}">{title}</a></li>',
                     noResultsText: '{{site.data.strings.search_no_results_text}}',
                             limit: 10,

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: lsm-hpce.gitpages.psi.ch/latest
+    image: result/latest
     ports:
       - "4001:4001"
     volumes: