Fix various problems with the docker setup and frontend changes (#8846)

Fix various problems with the docker setup and frontend changes
* Set the node version to the same one that is used in the final packages and that is required in package.json
* Change the order of operations for backend container building
* Set the npm dependencies back to where they were
* Change browserslist rules for firefox
* Fix some docker commands for pullpreview
* Add b12f as a pullpreview admin

Co-authored-by: ulferts <jens.ulferts@googlemail.com>

.github/workflows/pullpreview.yml

@@ -28,7 +28,7 @@ jobs:
         cp ./docker/prod/Dockerfile ./Dockerfile
     - uses: pullpreview/action@v4
       with:
-        admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde
+        admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,b12f
         always_on: dev
         compose_files: docker-compose.pullpreview.yml
         instance_type: medium_2_0

docker/dev/backend/Dockerfile

@@ -48,7 +48,9 @@ RUN apt-get update -qq && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
     jq
 
-USER $USER
 COPY ./docker/dev/backend/scripts/run-test /usr/sbin/run-test
 COPY ./docker/dev/backend/scripts/setup-tests /usr/sbin/setup-tests
+
+USER $USER
+
 ENTRYPOINT [ "/usr/sbin/run-test" ]

docker/dev/frontend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10.15
+FROM node:12.18
 MAINTAINER operations@openproject.com
 
 ARG DEV_UID=1000

docker/prod/setup/postinstall-common.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 set -e
 set -o pipefail
 

docker/prod/setup/postinstall.sh

@@ -14,7 +14,7 @@ display_error() {
 echo " ---> POSTINSTALL"
 
 # Add MySQL-to-Postgres migration script to path (used in entrypoint.sh)
-cp ./docker/mysql-to-postgres/bin/migrate-mysql-to-postgres /usr/local/bin/
+cp ./docker/prod/mysql-to-postgres/bin/migrate-mysql-to-postgres /usr/local/bin/
 
 # Ensure we can write in /tmp/op_uploaded_files (cf. #29112)
 mkdir -p /tmp/op_uploaded_files/ && chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/
@@ -27,7 +27,6 @@ if test -f ./docker/prod/setup/postinstall-$PLATFORM.sh ; then
 fi
 
 echo " ---> Precompiling assets. This will take a while..."
-./docker/prod/setup/postinstall-common.sh > /tmp/dockerize.log || display_error
+./docker/prod/setup/postinstall-common.sh
 
-rm -f /tmp/dockerize.log
 echo "      OK."

docker/pullpreview/docker-compose.yml

@@ -1,5 +1,5 @@
 db:
-  image: postgres:9.6.3
+  image: postgres:10
   environment:
     POSTGRES_USER: app
     POSTGRES_PASSWORD: p4ssw0rd
@@ -21,7 +21,7 @@ web:
   env_file: ./.env.pullpreview
   ports:
     - "80:8080"
-  command: "./docker/web"
+  command: "./docker/prod/web"
   volumes:
     - "/var/openproject/assets"
 
@@ -35,6 +35,6 @@ worker:
     - "SECRET_KEY_BASE=d4e74f017910ac56c6ebad01165b7e1b37f4c9c02e9716836f8670cdc8d65a231e64e4f6416b19c8"
     - "RAILS_ENV=production"
   env_file: ./.env.pullpreview
-  command: "./docker/worker --seed --set attachment_max_size=262144,host_name=${PULLPREVIEW_PUBLIC_DNS}"
+  command: "./docker/prod/worker --seed --set attachment_max_size=262144,host_name=${PULLPREVIEW_PUBLIC_DNS}"
   volumes_from:
     - web

frontend/browserslist

@@ -4,4 +4,5 @@
 last 2 Chrome versions
 last 2 Safari versions
 last 2 Edge versions
-Firefox >= 60
+last 2 Firefox versions
+Firefox esr

frontend/npm-shrinkwrap.json

@@ -2530,7 +2530,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@types/assertion-error/-/assertion-error-1.1.0.tgz",
       "integrity": "sha512-32f/Uonzj4fU2WPRo3Jd8x7vilyZvjdUV6YZwMW2QNkTc/mRs0BLWIqUAjzwnYDnkMFREIwqsd1Qcl5cjE6A8A==",
-      "dev": true,
       "requires": {
         "assertion-error": "*"
       }
@@ -2547,7 +2546,6 @@
       "version": "0.0.87",
       "resolved": "https://registry.npmjs.org/@types/codemirror/-/codemirror-0.0.87.tgz",
       "integrity": "sha512-Yv+cw1zckMDK35QJBMMK/z9ZWUHRUpQ2KJI+MCbR95HhDWtSQsS66j/W9OMq3JUqYL7Jb2zHA7fc575/0v1sfA==",
-      "dev": true,
       "requires": {
         "@types/tern": "*"
       }
@@ -2560,20 +2558,17 @@
     "@types/dragula": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/@types/dragula/-/dragula-3.7.0.tgz",
-      "integrity": "sha512-Scr3lQ7pDmwic+I4qrzDEIfPVGUhc/qo8S0VJJ9v5pzTyIIJzAXrnFajjsMSL8J84VERIkZUh7wH6wYEisY+TA==",
+      "integrity": "sha512-Scr3lQ7pDmwic+I4qrzDEIfPVGUhc/qo8S0VJJ9v5pzTyIIJzAXrnFajjsMSL8J84VERIkZUh7wH6wYEisY+TA=="
-      "dev": true
     },
     "@types/es6-shim": {
       "version": "0.31.39",
       "resolved": "https://registry.npmjs.org/@types/es6-shim/-/es6-shim-0.31.39.tgz",
-      "integrity": "sha512-z2JtmHE1wg75JTdT1qWGvW4eDOk6DUW1Exdzrs+8QTPFttkdTr4pKVzLLCCAOUC8i/KiG+QtkSEteQ5hDxwbpg==",
+      "integrity": "sha512-z2JtmHE1wg75JTdT1qWGvW4eDOk6DUW1Exdzrs+8QTPFttkdTr4pKVzLLCCAOUC8i/KiG+QtkSEteQ5hDxwbpg=="
-      "dev": true
     },
     "@types/estree": {
       "version": "0.0.42",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.42.tgz",
-      "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ==",
+      "integrity": "sha512-K1DPVvnBCPxzD+G51/cxVIoc2X8uUVl1zpJeE6iKcgHMj4+tbat5Xu4TjV7v2QSDbIeAfLi2hIk+u2+s0MlpUQ=="
-      "dev": true
     },
     "@types/glob": {
       "version": "7.1.3",
@@ -2587,8 +2582,7 @@
     "@types/hammerjs": {
       "version": "2.0.36",
       "resolved": "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.36.tgz",
-      "integrity": "sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==",
+      "integrity": "sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ=="
-      "dev": true
     },
     "@types/jasmine": {
       "version": "3.5.8",
@@ -2609,7 +2603,6 @@
       "version": "3.3.33",
       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.33.tgz",
       "integrity": "sha512-U6IdXYGkfUI42SR79vB2Spj+h1Ly3J3UZjpd8mi943lh126TK7CB+HZOxGh2nM3IySor7wqVQdemD/xtydsBKA==",
-      "dev": true,
       "requires": {
         "@types/sizzle": "*"
       }
@@ -2618,7 +2611,6 @@
       "version": "1.12.10",
       "resolved": "https://registry.npmjs.org/@types/jqueryui/-/jqueryui-1.12.10.tgz",
       "integrity": "sha512-T8sctslWIiLl/2EHEQQfKCB92S9bMKBaeE3+iBRbSERMK/1gzyfqjaIEksduB4eUEsKq+Ji0Y+qVbiXQwI2Mwg==",
-      "dev": true,
       "requires": {
         "@types/jquery": "*"
       }
@@ -2631,8 +2623,7 @@
     "@types/lodash": {
       "version": "4.14.149",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz",
-      "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==",
+      "integrity": "sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="
-      "dev": true
     },
     "@types/minimatch": {
       "version": "3.0.3",
@@ -2643,7 +2634,6 @@
       "version": "0.5.12",
       "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz",
       "integrity": "sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==",
-      "dev": true,
       "requires": {
         "moment": ">=2.14.0"
       }
@@ -2651,8 +2641,7 @@
     "@types/mousetrap": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/@types/mousetrap/-/mousetrap-1.6.3.tgz",
-      "integrity": "sha512-13gmo3M2qVvjQrWNseqM3+cR6S2Ss3grbR2NZltgMq94wOwqJYQdgn8qzwDshzgXqMlSUtyPZjysImmktu22ew==",
+      "integrity": "sha512-13gmo3M2qVvjQrWNseqM3+cR6S2Ss3grbR2NZltgMq94wOwqJYQdgn8qzwDshzgXqMlSUtyPZjysImmktu22ew=="
-      "dev": true
     },
     "@types/node": {
       "version": "13.9.0",
@@ -2662,14 +2651,12 @@
     "@types/pako": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.1.tgz",
-      "integrity": "sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==",
+      "integrity": "sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg=="
-      "dev": true
     },
     "@types/promises-a-plus": {
       "version": "0.0.27",
       "resolved": "https://registry.npmjs.org/@types/promises-a-plus/-/promises-a-plus-0.0.27.tgz",
-      "integrity": "sha1-xkZRE0YUyEuPXXEUzokB02pgl4A=",
+      "integrity": "sha1-xkZRE0YUyEuPXXEUzokB02pgl4A="
-      "dev": true
     },
     "@types/q": {
       "version": "1.5.4",
@@ -2679,20 +2666,17 @@
     "@types/resize-observer-browser": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@types/resize-observer-browser/-/resize-observer-browser-0.1.4.tgz",
-      "integrity": "sha512-rPvqs+1hL/5hbES/0HTdUu4lvNmneiwKwccbWe7HGLWbnsLdqKnQHyWLg4Pj0AMO7PLHCwBM1Cs8orChdkDONg==",
+      "integrity": "sha512-rPvqs+1hL/5hbES/0HTdUu4lvNmneiwKwccbWe7HGLWbnsLdqKnQHyWLg4Pj0AMO7PLHCwBM1Cs8orChdkDONg=="
-      "dev": true
     },
     "@types/rosie": {
       "version": "0.0.37",
       "resolved": "https://registry.npmjs.org/@types/rosie/-/rosie-0.0.37.tgz",
-      "integrity": "sha512-ZjeBPOz2ny50513sxtGpI9iIyH8+N/Ac1F9MIxzPJsyf6nSTdVuzsCEMzEbKqCubru/u1uvBiQa4lUBptvdIUw==",
+      "integrity": "sha512-ZjeBPOz2ny50513sxtGpI9iIyH8+N/Ac1F9MIxzPJsyf6nSTdVuzsCEMzEbKqCubru/u1uvBiQa4lUBptvdIUw=="
-      "dev": true
     },
     "@types/sizzle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
+      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
-      "dev": true
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -2703,7 +2687,6 @@
       "version": "0.23.3",
       "resolved": "https://registry.npmjs.org/@types/tern/-/tern-0.23.3.tgz",
       "integrity": "sha512-imDtS4TAoTcXk0g7u4kkWqedB3E4qpjXzCpD2LU5M5NAXHzCDsypyvXSaG7mM8DKYkCRa7tFp4tS/lp/Wo7Q3w==",
-      "dev": true,
       "requires": {
         "@types/estree": "*"
       }
@@ -2711,14 +2694,12 @@
     "@types/urijs": {
       "version": "1.19.6",
       "resolved": "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.6.tgz",
-      "integrity": "sha512-kdnK+JtEiUgnpB7r99SAZjjz9nhZ/7MWo/hxTSNfvslAa4r8jpDXDEJ2cQrjemes4eX2Y5Om3udmcc8QalPzOA==",
+      "integrity": "sha512-kdnK+JtEiUgnpB7r99SAZjjz9nhZ/7MWo/hxTSNfvslAa4r8jpDXDEJ2cQrjemes4eX2Y5Om3udmcc8QalPzOA=="
-      "dev": true
     },
     "@types/webpack-env": {
       "version": "1.15.1",
       "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.1.tgz",
-      "integrity": "sha512-eWN5ElDTeBc5lRDh95SqA8x18D0ll2pWudU3uWiyfsRmIZcmUXpEsxPU+7+BsdCrO2vfLRC629u/MmjbmF+2tA==",
+      "integrity": "sha512-eWN5ElDTeBc5lRDh95SqA8x18D0ll2pWudU3uWiyfsRmIZcmUXpEsxPU+7+BsdCrO2vfLRC629u/MmjbmF+2tA=="
-      "dev": true
     },
     "@types/webpack-sources": {
       "version": "0.1.8",
@@ -3320,8 +3301,7 @@
     "assertion-error": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
-      "dev": true
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -3633,15 +3613,6 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
     },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
     "blob": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
@@ -6510,12 +6481,6 @@
         }
       }
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "optional": true
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -14579,7 +14544,6 @@
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -15143,7 +15107,6 @@
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "optional": true,
           "requires": {
-            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

frontend/package.json

@@ -9,23 +9,6 @@
     "@types/jasmine": "~3.5.7",
     "@types/jasminewd2": "~2.0.8",
     "@types/node": "^13.7.7",
-    "@types/resize-observer-browser": "^0.1.4",
-    "@types/assertion-error": "^1.1.0",
-    "@types/chart.js": "^2.9.20",
-    "@types/codemirror": "0.0.87",
-    "@types/dragula": "^3.7.0",
-    "@types/es6-shim": "^0.31.39",
-    "@types/hammerjs": "^2.0.36",
-    "@types/jquery": "^3.3.33",
-    "@types/jqueryui": "^1.12.10",
-    "@types/lodash": "^4.14.149",
-    "@types/moment-timezone": "^0.5.12",
-    "@types/mousetrap": "^1.6.3",
-    "@types/pako": "^1.0.1",
-    "@types/promises-a-plus": "0.0.27",
-    "@types/rosie": "0.0.37",
-    "@types/urijs": "^1.19.6",
-    "@types/webpack-env": "^1.15.1",
     "body-parser": "^1.19.0",
     "circular-dependency-plugin": "^5.2.0",
     "codelyzer": "^6.0.0",
@@ -68,6 +51,23 @@
     "@ng-select/ng-option-highlight": "0.0.5",
     "@ng-select/ng-select": "^4.0.4",
     "@sentry/browser": "^5.13.0",
+    "@types/resize-observer-browser": "^0.1.4",
+    "@types/assertion-error": "^1.1.0",
+    "@types/chart.js": "^2.9.20",
+    "@types/codemirror": "0.0.87",
+    "@types/dragula": "^3.7.0",
+    "@types/es6-shim": "^0.31.39",
+    "@types/hammerjs": "^2.0.36",
+    "@types/jquery": "^3.3.33",
+    "@types/jqueryui": "^1.12.10",
+    "@types/lodash": "^4.14.149",
+    "@types/moment-timezone": "^0.5.12",
+    "@types/mousetrap": "^1.6.3",
+    "@types/pako": "^1.0.1",
+    "@types/promises-a-plus": "0.0.27",
+    "@types/rosie": "0.0.37",
+    "@types/urijs": "^1.19.6",
+    "@types/webpack-env": "^1.15.1",
     "@uirouter/angular": "^7.0.0",
     "@uirouter/core": "^6.0.6",
     "@uirouter/rx": "^0.6.5",