Merge pull request #690 from bosch-io/feature/sidebar

Hide sidebar

Author: Philipp Etschel

.github/workflows/build.yml

@@ -70,8 +70,10 @@ jobs:
             type=edge,branch=main,priority=700
 
       # Test Phase
+      - name: Test frontend license headers
+        run: npm --prefix frontend run license-file-headers-check
 
-      - name: Test with npm
+      - name: Test frontend dependency licenses
         ## TODO are there any frontend tests?
         run: npm --prefix frontend run license-check
 

Dockerfile

@@ -26,7 +26,18 @@ RUN mvn clean package -DskipTests=true -Dspotbugs.skip=true -Dpmd.skip=true
 
 # Runtime Container
 FROM amazoncorretto:17-alpine
+
+# Setup rights for overwriting frontend runtime variables
+COPY --from=VUE /frontend/setup-runtime.sh setup-runtime.sh
+
+RUN \
+    mkdir public && \
+    chmod a+x ./setup-runtime.sh && \
+    chmod -R a+rw ./public
+
+COPY --from=VUE /frontend/dist/env.js ./public/env.js
 COPY --from=MAVEN /home/maven/business-partner-agent/target/business-partner-agent*SNAPSHOT.jar business-partner-agent.jar
 
+
 EXPOSE 8080
-CMD java -XX:+UnlockExperimentalVMOptions -Dcom.sun.management.jmxremote ${JAVA_OPTS} -jar business-partner-agent.jar
+CMD ./setup-runtime.sh public/env.js business-partner-agent.jar && java -XX:+UnlockExperimentalVMOptions -Dcom.sun.management.jmxremote ${JAVA_OPTS} -jar business-partner-agent.jar

Dockerfile.run

@@ -3,10 +3,23 @@
 FROM adoptopenjdk/openjdk15:alpine
 
 RUN adduser --disabled-password app
+
+WORKDIR /home/app
+
+# Setup rights for overwriting frontend runtime variables
+COPY ./frontend/setup-runtime.sh setup-runtime.sh
+
+RUN \
+    mkdir public && \
+    chmod a+x ./setup-runtime.sh && \
+    chmod -R a+rw ./public
+
+# Non-root
 USER app
 WORKDIR /home/app
 
-EXPOSE 8080
-CMD java -XX:+UnlockExperimentalVMOptions -Dcom.sun.management.jmxremote ${JAVA_OPTS} -jar business-partner-agent.jar
+COPY ./frontend/dist/env.js ./public/env.js
+COPY ./backend/business-partner-agent/target/business-partner-agent*.jar business-partner-agent.jar
 
-COPY ./backend/business-partner-agent/target/business-partner-agent*.jar business-partner-agent.jar
+EXPOSE 8080
+CMD ./setup-runtime.sh public/env.js business-partner-agent.jar && java -XX:+UnlockExperimentalVMOptions -Dcom.sun.management.jmxremote ${JAVA_OPTS} -jar business-partner-agent.jar

frontend/.eslintignore

@@ -7,5 +7,6 @@
 **/*.scss
 **/*.sass
 **/*.html
+**/*.sh
 node_modules
 dist

frontend/.eslintrc.js

@@ -31,6 +31,7 @@ module.exports = {
     "vue/comment-directive": "warn",
     "unicorn/prefer-module": "off",
     "unicorn/filename-case": "off",
+    "unicorn/prevent-abbreviations": "off",
     "@typescript-eslint/ban-ts-comment": "warn",
   },
 };

frontend/.prettierignore

@@ -5,3 +5,4 @@
 # SPDX-License-Identifier: Apache-2.0
 dist
 node_modules
+setup-runtime.sh

frontend/license-header/config.json

@@ -1,7 +1,13 @@
 {
-  "ignore": ["**/*.md", "**/*.svg", "license-header/license-header"],
+  "ignore": [
+    "**/*.md",
+    "**/*.svg",
+    "license-header/license-header",
+    "licenses/attribution.txt",
+    ".husky/_/**/*"
+  ],
   "license": "license-header/license-header",
-  "regexIdentifier": "##",
+  "regexIdentifier": "_!##",
   "defaultFormat": {
     "eachLine": {
       "prepend": "# "

frontend/license-header/license-header

@@ -1,4 +1,4 @@
-Copyright (c) 2020-##[0-9]{4}## - for information on the respective copyright owner
+Copyright (c) 2020-_!##[0-9]{4}_!## - for information on the respective copyright owner
 see the NOTICE file and/or the repository at
 https://github.com/hyperledger-labs/business-partner-agent
 

frontend/licenses/licenseInfos.json

@@ -1,13 +1,4 @@
 {
-  "@types/vue-moment": {
-    "ignore": false,
-    "name": "@types/vue-moment",
-    "version": "4.0.3",
-    "authors": "Dominik Schmidt <https://github.com/domschmidt>",
-    "url": "https://github.com/DefinitelyTyped/DefinitelyTyped",
-    "license": "MIT",
-    "licenseText": "    MIT License\n\n    Copyright (c) Microsoft Corporation.\n\n    Permission is hereby granted, free of charge, to any person obtaining a copy\n    of this software and associated documentation files (the \"Software\"), to deal\n    in the Software without restriction, including without limitation the rights\n    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n    copies of the Software, and to permit persons to whom the Software is\n    furnished to do so, subject to the following conditions:\n\n    The above copyright notice and this permission notice shall be included in all\n    copies or substantial portions of the Software.\n\n    THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n    SOFTWARE\n"
-  },
   "argparse": {
     "ignore": false,
     "name": "argparse",
@@ -28,7 +19,7 @@
   "core-js": {
     "ignore": false,
     "name": "core-js",
-    "version": "3.19.2",
+    "version": "3.19.3",
     "url": "https://github.com/zloirock/core-js",
     "license": "MIT",
     "licenseText": "Copyright (c) 2014-2021 Denis Pushkarev\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
@@ -89,11 +80,11 @@
   "lamejs": {
     "ignore": false,
     "name": "lamejs",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "authors": "Alex Zhukov",
     "url": "https://github.com/zhuker/lamejs",
     "license": "LGPL-3.0",
-    "licenseText": "Can I use LAME in my commercial program?  \n\nYes, you can, under the restrictions of the LGPL.  The easiest\nway to do this is to:\n\n1. Link to LAME as separate jar (lame.min.js or lame.all.js)\n\n2. Fully acknowledge that you are using LAME, and give a link\n   to our web site, www.mp3dev.org\n\n3. If you make modifications to LAME, you *must* release these\n   these modifications back to the LAME project, under the LGPL.\n"
+    "licenseText": "Can I use LAME in my commercial program?  \n\nYes, you can, under the restrictions of the LGPL.  The easiest\nway to do this is to:\n\n1. Link to LAME as separate jar (lame.min.js or lame.all.js)\n\n2. Fully acknowledge that you are using LAME, and give a link\n   to our web site, lame.sourceforge.net\n\n3. If you make modifications to LAME, you *must* release these\n   these modifications back to the LAME project, under the LGPL.\n"
   },
   "linkify-it": {
     "ignore": false,
@@ -184,7 +175,7 @@
   "vue-advanced-chat": {
     "ignore": false,
     "name": "vue-advanced-chat",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "authors": "Antoine Dupont <antoindupontdev@gmail.com>",
     "url": "https://github.com/antoine92190/vue-advanced-chat",
     "license": "MIT",
@@ -193,7 +184,7 @@
   "vue-i18n": {
     "ignore": false,
     "name": "vue-i18n",
-    "version": "8.26.5",
+    "version": "8.26.7",
     "authors": "kazuya kawaguchi <kawakazu80@gmail.com>",
     "url": "https://github.com/kazupon/vue-i18n",
     "license": "MIT",