2.0 light #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

raidray wants to merge 8 commits into master from 2.0-light

.circleci/config.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,9 @@ jobs: @@
           - run:
               name: Add hosts
               command: |
-                echo 0.0.0.0 api.wb.local | sudo tee -a /etc/hosts && \
-                echo 0.0.0.0 auth.wb.local | sudo tee -a /etc/hosts && \
+                echo 0.0.0.0 www.wb.local | sudo tee -a /etc/hosts && \
+                echo 0.0.0.0 peatio.wb.local | sudo tee -a /etc/hosts && \
+                echo 0.0.0.0 barong.wb.local | sudo tee -a /etc/hosts && \
                 echo 0.0.0.0 ws.ranger.wb.local | sudo tee -a /etc/hosts
           - run:
               name: Download apps
@@ Expand All / @@ -33,9 +34,6 @@ jobs: @@
           - run:
               name: Run workbench
               command: "make start"
-          - run:
-              name: Run integration tests
-              command: "make test"
     workflows:
       version: 2
@@ Expand Down @@

.env

-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
     COMPOSE_PROJECT_NAME=workbench
-    COMPOSE_FILE=compose/app.yaml:compose/backend.yaml:compose/cryptonodes.yaml:compose/daemons.yaml:compose/proxy.yaml:compose/tests.yaml
+    COMPOSE_FILE=compose/app.yaml:compose/backend.yaml:compose/cryptonodes.yaml:compose/daemons.yaml:compose/proxy.yaml:compose/tests.yaml:compose/ui.yaml:compose/gateway.yaml

.gitmodules

-Original file line number
+Diff line change
@@ -1,18 +1,14 @@
     [submodule "peatio"]
     	path = app/peatio
     	url = https://github.com/rubykube/peatio.git
-    	branch = "1-9-stable"
+    	branch = "master"
     [submodule "barong"]
     	path = app/barong
     	url = https://github.com/rubykube/barong.git
-    	branch = "1-9-stable"
-    [submodule "trading-ui"]
-    	path = app/trading-ui
-    	url = https://github.com/rubykube/peatio-trading-ui.git
-    	branch = "1-9-stable"
-    [submodule "integration"]
-    	path = test/integration
-    	url = https://github.com/rubykube/integration.git
+    	branch = "master"
+    [submodule "tower"]
+    	path = app/tower
+    	url = https://github.com/openware/tower.git
     	branch = "master"
     [submodule "toolbox"]
     	path = test/toolbox
@@ Expand Down @@

Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,40 +3,34 @@
  
    COMPOSE = docker-compose

    default: run

    pull:

    	$(COMPOSE) pull vault       \

    	@$(COMPOSE) pull vault      \

    	                db          \

    	                phpmyadmin  \

    	                redis       \

    	                rabbitmq    \

    	                mailcatcher \

    	                ranger      \

    	                coinhub     \

    	                geth

    	                coinhub

    config:

    	@echo "Rendering configuration..."

    	@echo -e "\e[34mRendering configuration...\e[0m"

    	@bundle exec rake config:render

    build: config pull

    	$(COMPOSE) build peatio     \

    	                 barong     \

    	                 trading_ui \

    	                 integration

    	@$(COMPOSE) build peatio barong

    geth:

    	@$(COMPOSE) up -d geth

    bitcoin:

    	@echo "Updating peatio configuration..."

    	@echo -e "\e[34mUpdating peatio configuration...\e[0m"

    	@cp config/peatio-seed-btc/*.yml config/peatio/seed/

    	@echo "Starting bitcoind container..."

    	@echo -e "\e[34mStarting bitcoind container...\e[0m"

    	@$(COMPOSE) up -d bitcoind

    cryptonodes: geth

    daemons:

    	$(COMPOSE) up --build -d withdraw_audit           \

    	@$(COMPOSE) up --build -d withdraw_audit          \

    	                         blockchain               \

    	                         global_state             \

    	                         deposit_collection       \

    @@ -52,32 +46,30 @@ daemons:
  
    	                         k

    dependencies:

    	$(COMPOSE) up -d vault db phpmyadmin redis rabbitmq mailcatcher ranger coinhub

    	$(COMPOSE) run --rm vault secrets enable totp || true

    	@$(COMPOSE) up -d vault db redis rabbitmq mailcatcher ranger coinhub

    	@$(COMPOSE) run --rm vault secrets enable totp || true

    proxy:

    	@touch config/acme.json && chmod 0600 config/acme.json

    prepare: proxy dependencies daemons cryptonodes

    prepare: proxy dependencies daemons

    setup-apps: build

    	$(COMPOSE) run --rm peatio bash -c "./bin/link_config && bundle exec rake db:create db:migrate db:seed"

    	$(COMPOSE) run --rm barong bash -c "./bin/link_config && ./bin/setup"

    run: prepare setup-apps

    	$(COMPOSE) up --build -d peatio barong trading_ui proxy

    	@$(COMPOSE) run --rm peatio bash -c "./bin/link_config && bundle exec rake db:create db:migrate db:seed"

    	@$(COMPOSE) run --rm barong bash -c "./bin/link_config && ./bin/setup"

    test:

    	@$(COMPOSE) run --rm integration

    run: config prepare setup-apps

    	@$(COMPOSE) up --build -d peatio barong proxy mikroapp tower gateway

    stress:

    	@bundle exec rake toolbox:run

    start: config prepare setup-apps

    	$(COMPOSE) up -d peatio barong trading_ui proxy

    	@$(COMPOSE) up -d peatio barong proxy mikroapp tower gateway

    update:

    	git submodule update --init --remote

    	@git submodule update --init --remote

    down:

    	@$(COMPOSE) down

    	@echo -e "\e[1;31mRemoving docker containers...\e[0m"

    	@$(COMPOSE) rm -fsv

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,11 @@ make build @@
     make bitcoin
     ```
-    This will create new seeds and start `bitcoind` docker container.
+. **Optional:** Start ethereum blockchain node
+    ```sh
+    make geth
+    ```
 . Run the application
@@ Expand All / @@ -56,8 +60,7 @@ make run @@
     You should add those hosts to your `/etc/hosts` file:
     ```
-.0.0.0 api.wb.local
-.0.0.0 auth.wb.local
+.0.0.0 www.wb.local
 .0.0.0 ws.ranger.wb.local
@@ Expand Down @@

app/barong

Submodule barong updated 432 files

app/peatio

Submodule peatio updated 298 files

app/tower

Submodule tower added at 3003dc

app/trading-ui

  
  Submodule trading-ui

    deleted from
      b9908c

compose/app.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    version: '3.6'
+    version: '3.7'
     services:
       peatio:
@@ Expand All / @@ -11,7 +11,6 @@ services: @@
           - rabbitmq
           - barong
           - ranger
-          - geth
           - coinhub
         env_file:
           - ../config/peatio.env
@@ Expand All / @@ -23,10 +22,6 @@ services: @@
           - ../config/peatio/plugins.yml:/opt/peatio/config/plugins.yml
           - ../app/peatio/app:/home/app/app
           - ../app/peatio/lib:/home/app/lib
-        labels:
-          traefik.enable: true
-          traefik.frontend.rule: 'Host: api.wb.local'
-          traefik.port: 8000
         command: bash -c "bin/link_config && bundle exec puma --config config/puma.rb"
       barong:
@@ Expand All / @@ -41,24 +36,6 @@ services: @@
           - ../config/barong.env
         volumes:
           - ../config/barong:/opt/barong/config:ro
+          - ../config/keys/barong.key:/secrets/barong.key
         expose:
           - "8001"
-        labels:
-          traefik.enable: true
-          traefik.frontend.rule: 'Host: auth.wb.local'
-          traefik.port: 8001
-      trading_ui:
-        build:
-          context: ../app/trading-ui
-        depends_on:
-          - proxy
-          - peatio
-        env_file:
-          - ../config/trading-ui.env
-        expose:
-          - "8002"
-        labels:
-          traefik.enable: true
-          traefik.frontend.rule: 'Host: api.wb.local; PathPrefix:/trading, /trading-ui-assets'
-          traefik.port: 8002

compose/backend.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,9 @@
  
    version: '3.6'

    version: '3.7'

    services:

      db:

        image: mysql:5.7

        volumes:

          - ../config/mysql/my.cnf:/etc/mysql/my.cnf

          - db_data:/var/lib/mysql

        environment:

          MYSQL_ROOT_PASSWORD: changeme

    @@ -13,29 +12,13 @@ services:
  
        image: rubykube/coinhub

      redis:

        image: redis:4.0.10

        image: redis:4-alpine

        restart: always

        volumes:

          - redis_data:/data

      phpmyadmin:

        image: phpmyadmin/phpmyadmin

        restart: always

        depends_on:

          - db

        environment:

          PMA_HOST: db

          PMA_USER: root

          PMA_PASSWORD: changeme

          PHP_UPLOAD_MAX_FILESIZE: 1G

          PHP_MAX_INPUT_VARS: 1G

        labels:

          traefik.enable: true

          traefik.frontend.rule: 'Host: pma.wb.local'

          traefik.port: 80

      rabbitmq:

        image: rabbitmq:3.7.6-management

        image: rabbitmq:3.7-alpine

        restart: always

        volumes:

          - rabbitmq_data:/var/lib/rabbitmq

    @@ -45,7 +28,7 @@ services:
  
          traefik.port: 15672

      vault:

        image: vault:0.10.2

        image: vault:1.0.1

        restart: always

        environment:

          SKIP_SETCAP: 1

compose/cryptonodes.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,8 +1,8 @@
  
    version: '3.6'

    version: '3.7'

    services:

      geth:

        image: ethereum/client-go:stable

        image: ethereum/client-go:alpine

        restart: always

        command: |

          --syncmode=full

compose/daemons.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    version: '3.6'
+    version: '3.7'
     x-daemon: &peatio-daemon
       build:
@@ Expand All / @@ -9,7 +9,6 @@ x-daemon: &peatio-daemon @@
         - db
         - redis
         - rabbitmq
-        - geth
         - barong
         - ranger
         - coinhub
@@ Expand Down @@

compose/gateway.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    version: '3.7'
+    services:
+      gateway:
+        image: quay.io/datawire/ambassador:0.40.2
+        volumes:
+          - ../config/gateway:/ambassador/ambassador-config
+        ports:
+          - '8081:80'
+          - '8877:8877'
+        labels:
+          traefik.enable: true
+          traefik.frontend.rule: "Host: www.wb.local; PathPrefix: /api/, /admin, /assets/"
+          traefik.port: 80

compose/proxy.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    version: '3.6'
+    version: '3.7'
     services:
       proxy:
@@ Expand All / @@ -10,15 +10,6 @@ services: @@
           - /var/run/docker.sock:/var/run/docker.sock
           - ../config/traefik.toml:/etc/traefik/traefik.toml:ro
           - ../config/acme.json:/acme.json
-        networks:
-          default:
-            aliases:
-              - api.wb.local
-              - auth.wb.local
-              - ws.ranger.wb.local
-              - pma.wb.local
-              - eth.wb.local
-              - monitor.wb.local
         labels:
           traefik.enable: true
           traefik.frontend.rule: 'Host: monitor.wb.local'
@@ Expand Down @@

compose/tests.yaml

-Original file line number
+Diff line change
@@ -1,12 +1,6 @@
-    version: '3.6'
+    version: '3.7'
     services:
-      integration:
-        build:
-          context: ../test/integration
-        volumes:
-          - ../config/integration/fixtures:/usr/src/app/src/fixtures/
       toolbox:
         build:
           context: ../test/toolbox
@@ Expand Down @@

compose/ui.yaml

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    version: '3.7'
+    services:
+      mikroapp:
+        image: rubykube/mikroapp
+        labels:
+          traefik.enable: true
+          traefik.frontend.rule: "Host:www.wb.local; PathPrefix: /"
+          traefik.port: 3000
+      tower:
+        build:
+          context: ../app/tower
+          dockerfile: Dockerfile.dev
+        volumes:
+          - ../app/tower:/home/node
+        labels:
+          traefik.enable: true
+          traefik.frontend.rule: "Host:www.wb.local; PathPrefix: /tower"
+          traefik.port: 3000

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2.0 light #276

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

2.0 light #276

Are you sure you want to change the base?

Uh oh!

2.0 light #276

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!