Merge pull request #2084 from OriginTrail/v6/prerelease/testnet

OriginTrail 6.0.0-beta.2.2.3 Testnet Release
OriginTrail · Sep 9, 2022 · e80cdc7 · e80cdc7
2 parents 63ea99b + 72d62b8
commit e80cdc7
Show file tree

Hide file tree

Showing 171 changed files with 21,769 additions and 40,082 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
@@ -6,7 +6,7 @@ module.exports = {
     extends: ['airbnb/base', 'prettier'],
     parserOptions: {
         sourceType: 'module',
-        ecmaVersion: 2021,
+        ecmaVersion: 'latest'
     },
     rules: {
         'linebreak-style': ['error', 'unix'],
@@ -18,6 +18,7 @@ module.exports = {
         'no-console': 'warn',
         'no-continue': 1,
         'no-underscore-dangle': 0,
+        'import/extensions': 0,
     },
     overrides: [
         {

diff --git a/.github/workflows/TEST-release.yml → .github/workflows/TEST-bdd.yml b/.github/workflows/TEST-release.yml → .github/workflows/TEST-bdd.yml
@@ -1,4 +1,4 @@
-name: TEST-release
+name: TEST-bdd
 
 #todo this test should be execute when opening PR to prerelease/release branches
 on: [pull_request]
@@ -9,7 +9,7 @@ env:
   REPOSITORY_PASSWORD: password
 jobs:
 
-  test-release:
+  test-bdd:
     #todo think about locking the version - version should be the same as the one in official documentation
     runs-on: ubuntu-latest
     services:
@@ -42,7 +42,7 @@ jobs:
       - run: sudo chmod -R 777 $ARTIFACTS_DIR
       - run: mkdir -p $CUCUMBER_ARTIFACTS_DIR
       - run: sudo chmod -R 777 $CUCUMBER_ARTIFACTS_DIR
-      - run: npm run test:bdd:release;
+      - run: npm run test:bdd;
       - uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:

diff --git a/Alpine.Dockerfile b/Alpine.Dockerfile
@@ -9,7 +9,7 @@ RUN tar xzf ./remote_syslog_linux_amd64.tar.gz && cd remote_syslog && cp ./remot
 
 COPY config/papertrail.yml /etc/log_files.yml
 
-#Install nodemon, git & forever
+#Install git & forever
 RUN npm install forever -g
 RUN apk add git
 

diff --git a/Debian.Dockerfile b/Debian.Dockerfile
@@ -38,7 +38,7 @@ COPY config/papertrail.yml /etc/log_files.yml
 
 
 
-#Install nodemon & forever
+#Install forever
 RUN npm install forever -g
 
 
@@ -52,5 +52,5 @@ COPY . .
 RUN npm install
 
 #Mysql intialization
-RUN service mariadb start && mysql -u root  -e "CREATE DATABASE operationaldb /*\!40100 DEFAULT CHARACTER SET utf8 */; SET PASSWORD FOR root@localhost = PASSWORD(''); FLUSH PRIVILEGES;" && npx sequelize --config=./config/sequelizeConfig.js db:migrate
+RUN service mariadb start && mysql -u root  -e "CREATE DATABASE operationaldb /*\!40100 DEFAULT CHARACTER SET utf8 */; SET PASSWORD FOR root@localhost = PASSWORD(''); FLUSH PRIVILEGES;"
 
diff --git a/Ubuntu.Dockerfile b/Ubuntu.Dockerfile
@@ -22,7 +22,7 @@ COPY config/papertrail.yml /etc/log_files.yml
 
 
 
-#Install nodemon
+#Install forever
 RUN npm install -g forever
 
 
@@ -38,5 +38,5 @@ RUN npm install
 #Intialize mysql
 RUN usermod -d /var/lib/mysql/ mysql
 RUN echo "disable_log_bin" >> /etc/mysql/mysql.conf.d/mysqld.cnf
-RUN service mysql start && mysql -u root  -e "CREATE DATABASE operationaldb /*\!40100 DEFAULT CHARACTER SET utf8 */; update mysql.user set plugin = 'mysql_native_password' where User='root'/*\!40100 DEFAULT CHARACTER SET utf8 */; flush privileges;" && npx sequelize --config=./config/sequelizeConfig.js db:migrate
+RUN service mysql start && mysql -u root  -e "CREATE DATABASE operationaldb /*\!40100 DEFAULT CHARACTER SET utf8 */; update mysql.user set plugin = 'mysql_native_password' where User='root'/*\!40100 DEFAULT CHARACTER SET utf8 */; flush privileges;"