Update to build sharelatex from source

erb/docker-build.sh.erb

@@ -13,18 +13,18 @@ echo "building quiz"
 docker build --tag enote/dtu-quiz:<%= @docker_version_tag %> --tag <%= @docker_registry%>/enote/dtu-quiz:<%= @docker_version_tag %>  <%= @src_root %>/dtu-quiz
 <% end %>
 
-<% if enabled_features[:getpdf] %>
-echo "Building getpdf"
-docker build --tag enote/dtu-enote-getpdf:<%= @docker_version_tag %> --tag <%= @docker_registry%>/enote/dtu-enote-getpdf:<%= @docker_version_tag %> <%= @src_root %>/dtu-enote-getpdf
-<% end %>
-
 <% if enabled_features[:sharelatexdb] %>
 docker pull mongo:4.0.0
 <% end %>
 
 <% if enabled_features[:sharelatex] %>
 echo "Building sharelatex"
-docker build --tag enote/dtu-enote-sharelatex:<%= @docker_version_tag %> --tag <%= @docker_registry%>/enote/dtu-enote-sharelatex:<%= @docker_version_tag %> <%= @src_root %>/dtu-enote-sharelatex
+docker build --tag enote/dtu-enote-sharelatex:<%= @docker_version_tag %> --tag enote/dtu-enote-sharelatex:latest  --tag <%= @docker_registry%>/enote/dtu-enote-sharelatex:<%= @docker_version_tag %> <%= @src_root %>/dtu-enote-sharelatex/sharelatex
+<% end %>
+
+<% if enabled_features[:getpdf] %>
+echo "Building getpdf"
+docker build --tag enote/dtu-enote-getpdf:<%= @docker_version_tag %> --tag <%= @docker_registry%>/enote/dtu-enote-getpdf:<%= @docker_version_tag %> <%= @src_root %>/dtu-enote-getpdf
 <% end %>
 
 echo "Building website"

erb/docker-compose-enote.yml.erb

@@ -23,7 +23,6 @@ services:
   quiz-db:
     container_name: quiz-db
     image: <%= @docker_registry %>/enote/dtu-enote-mongodb<%= ':' + @docker_version_tag %>
-#    build: <%= @src_root %>/quiz-db
     logging:
       driver: "json-file"
       options:
@@ -107,7 +106,6 @@ services:
       - <%= @data_root %>/content:/content
       - <%= @data_root %>/filemanager-public:/public
       - <%= @log_root %>/filemanager:/app/log
-#      - /Users/iain/Projects/enote/dtu-enote-installer/src/filemanager/index.js:/app/index.js
     env_file: external.env
     environment:
       DTU_FILEMANAGER_ROOT: '/content'
@@ -118,34 +116,6 @@ services:
       - revproxynet
 <% end %>
 
-<% if enabled_features[:getpdf] %>
-  get-pdf:
-    container_name: get-pdf
-    image: <%= @docker_registry %>/enote/dtu-enote-getpdf<%= ':' + @docker_version_tag %>
-#    build: <%= @src_root %>/dtu-enote-getpdf
-    expose:
-      - "22"
-      - "8080"
-    depends_on:
-      - sharelatex-db
-    ports:
-      - "8080:8080"
-<% if limits.dig(:getpdf, :memory) %>
-    mem_limit: <%= limits[:getpdf][:memory] %>
-<% end %>
-    volumes:
-      - <%= @data_root %>/config:/data/config
-      - <%= @data_root %>/content:/content
-      - <%= @log_root %>/getpdf:/getpdf-server/log
-      - <%= @data_root %>/sharelatex-data/:/sharelatex
-      - getpdf_cache:/cache
-    environment:
-      TIMEZONE_CITY: '<%= timezone_city %>'
-      TZ: '<%= timezone %>'
-    networks:
-      - revproxynet
-<% end %>
-
 <% if enabled_features[:sharelatexdb] %>
   sharelatex-db:
     container_name: <%= @container_prefix %>sharelatex-db
@@ -209,6 +179,34 @@ services:
       - revproxynet
   <% end %>
 
+<% if enabled_features[:getpdf] %>
+  get-pdf:
+    container_name: get-pdf
+    image: <%= @docker_registry %>/enote/dtu-enote-getpdf<%= ':' + @docker_version_tag %>
+    expose:
+      - "22"
+      - "8080"
+    depends_on:
+      - sharelatex-db
+    ports:
+      - "8080:8080"
+<% if limits.dig(:getpdf, :memory) %>
+    mem_limit: <%= limits[:getpdf][:memory] %>
+<% end %>
+    volumes:
+      - <%= @data_root %>/config:/data/config
+      - <%= @data_root %>/content:/content
+      - <%= @log_root %>/getpdf:/getpdf-server/log
+      - <%= @data_root %>/sharelatex-data/:/sharelatex
+      - getpdf_cache:/cache
+    environment:
+      TIMEZONE_CITY: '<%= timezone_city %>'
+      TZ: '<%= timezone %>'
+    networks:
+      - revproxynet
+<% end %>
+
+
 
   course-website:
     container_name: <%= @container_prefix %>course_website

generate.rb

@@ -267,5 +267,6 @@ system("chmod +x #{@gen_root}/*.sh")
 
 #raise "Not all volumes exist!" unless DockerComposeHelpers::EnsureVolumesExist.ensure { |file| puts file; File.exist? file }
 raise "Not all volumes exist!" unless DockerComposeHelpers::EnsureVolumesExist.ensure(File.join(@gen_root, 'docker-compose-enote.yml') ) { |filename|
+  puts "Checking volume #{filename}"
   safe_exist?(filename)
 }