Skip to content

Commit

Permalink
Merge pull request #2121 from OriginTrail/v6/prerelease/testnet
Browse files Browse the repository at this point in the history
OriginTrail 6.0.0-beta.2.2.5 Testnet Release
  • Loading branch information
zeroxbt authored Oct 13, 2022
2 parents 0391a72 + 310d143 commit dc608df
Show file tree
Hide file tree
Showing 193 changed files with 27,279 additions and 42,825 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @branarakic @djordjekovac @kotlarmilos @NZT48
* @branarakic @djordjekovac @kotlarmilos @NZT48 @zeroxbt
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

#npm run lint-staged
npm run lint-staged
2 changes: 1 addition & 1 deletion Alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Debian.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COPY config/papertrail.yml /etc/log_files.yml



#Install nodemon & forever
#Install forever
RUN npm install forever -g


Expand All @@ -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;"

4 changes: 2 additions & 2 deletions Ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ COPY config/papertrail.yml /etc/log_files.yml



#Install nodemon
#Install forever
RUN npm install -g forever


Expand All @@ -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;"

150 changes: 110 additions & 40 deletions config/config.json

Large diffs are not rendered by default.

Loading

0 comments on commit dc608df

Please sign in to comment.