From 17462399a72944da41135c5a2046df334f3e24ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Mon, 10 Dec 2018 15:10:57 +0100
Subject: [PATCH] Restrict build targets

[ci skip]
---
 .pkgr.yml               | 18 ++----------------
 lib/tasks/packager.rake | 10 ++++++++++
 packaging/teardown      |  7 ++-----
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/.pkgr.yml b/.pkgr.yml
index 4f87bcf11a4..7d1e2162f28 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -1,23 +1,9 @@
 user: openproject
 group: openproject
 targets:
-  debian-8: &debian8
+  ubuntu-18.04:
     build_dependencies:
       - libsqlite3-dev
-  debian-9:
-    <<: *debian8
-  ubuntu-14.04:
-    <<: *debian8
-  ubuntu-16.04:
-    <<: *debian8
-  ubuntu-18.04:
-    <<: *debian8
-  centos-7:
-   dependencies:
-      - epel-release
-  sles-12:
-    build_dependencies:
-      - sqlite3-devel
 before_precompile: "packaging/setup"
 after_precompile: "packaging/teardown"
 crons:
@@ -35,5 +21,5 @@ wizards:
   - https://github.com/finnlabs/addon-repositories.git
   - https://github.com/pkgr/addon-smtp.git
   - https://github.com/pkgr/addon-memcached.git
-  - https://github.com/pkgr/addon-openproject.git
+  - https://github.com/opf/addon-openproject.git#dynamic-node-dependencies
 buildpack: https://github.com/opf/heroku-buildpack-multi.git
diff --git a/lib/tasks/packager.rake b/lib/tasks/packager.rake
index 51271cd58bc..9698bfc1883 100644
--- a/lib/tasks/packager.rake
+++ b/lib/tasks/packager.rake
@@ -47,6 +47,16 @@ namespace :packager do
   # avoids to load the environment multiple times.
   # Removes older assets
   task postinstall: [:environment, 'assets:clean', 'setup:scm'] do
+
+    # We need to precompile assets when either
+    # 1. packager requested it
+    # 2. When a custom Gemfile is added
+    if ENV['MUST_REBUILD_ASSETS'] == 'true'
+      Rake::Task['assets:precompile'].invoke
+      FileUtils.chmod_R 'a+rx', "#{ENV['APP_HOME']}/public/assets/"
+      shell_setup(['config:set', 'MUST_REBUILD_ASSETS=""'])
+    end
+
     # Clear any caches
     OpenProject::Cache.clear
 
diff --git a/packaging/teardown b/packaging/teardown
index eefb7cb49b1..63f10cc865d 100755
--- a/packaging/teardown
+++ b/packaging/teardown
@@ -2,8 +2,5 @@
 
 set -e
 
-: ${APP_HOME?"Need to set APP_HOME for teardown"}
-
-echo "Cleaning up NODE installation"
-pushd $APP_HOME
-rm -rf .heroku/node node_modules frontend/node_modules || true
+echo "Cleaning up current node_modules folders"
+rm -rf node_modules frontend/node_modules || true