Sfoglia il codice sorgente

simplify docker and docker-compose files

Mokhtar Naamani 4 anni fa
parent
commit
36c303b356

+ 9 - 8
.github/workflows/run-network-tests.yml

@@ -16,13 +16,14 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - name: build npm packages
-        run: |
-          yarn install --frozen-lockfile
-          yarn workspace joystream-testing install
-      - name: set block production to 2000ms for faster tests
+      - name: Install packages and dependencies
+        run: yarn install --frozen-lockfile
+      - name: Ensure tests are runnable
+        run: yarn workspace joystream-testing build
+      - name: Configure block production to 2000ms (fatser tests)
         run: ./scripts/alter-block-creation-time.sh
-      - name: start network
-        run: docker-compose -f devops/dockerfiles/node-and-runtime/build-and-run-single-node-dev.yml up -d
-      - name: execute tests
+      - name: Build and start chain
+        working-directory: devops/dockerfiles/node-and-runtime/
+        run: docker-compose up -d
+      - name: Execute network tests
         run: yarn workspace joystream-testing test

+ 0 - 14
devops/dockerfiles/node-and-runtime/build-and-run-single-node-dev.yml

@@ -1,14 +0,0 @@
-version: "3"
-services:
-  node_alice:
-    image: joystream/node
-    build:
-      context: ../../../
-      dockerfile: devops/dockerfiles/node-and-runtime/Dockerfile
-    container_name: alice
-    entrypoint: ./node --dev --alice --validator --unsafe-ws-external --rpc-cors=all
-    ports:
-      - "30333:30333"
-      - "9933:9933"
-      - "9944:9944"
-  

+ 9 - 0
devops/dockerfiles/node-and-runtime/docker-compose-no-build.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  node:
+    image: joystream/node
+    container_name: joystream-node
+    command: --dev --alice --validator --unsafe-ws-external --rpc-cors=all
+    ports:
+      - "9944:9944"
+  

+ 15 - 0
devops/dockerfiles/node-and-runtime/docker-compose.yml

@@ -0,0 +1,15 @@
+version: "3"
+services:
+  node:
+    image: joystream/node
+    # Build image if not found
+    build:
+      # context is relative to the compose file
+      context: ../../../
+      # dockerfile is relative to working dir
+      dockerfile: ./Dockerfile
+    container_name: joystream-node
+    command: --dev --alice --validator --unsafe-ws-external --rpc-cors=all
+    ports:
+      - "9944:9944"
+  

+ 0 - 11
devops/dockerfiles/node-and-runtime/run-single-node-dev.yml

@@ -1,11 +0,0 @@
-version: "3"
-services:
-  node_alice:
-    image: joystream/node
-    container_name: alice
-    entrypoint: ./node --dev --alice --validator --unsafe-ws-external --rpc-cors=all
-    ports:
-      - "30333:30333"
-      - "9933:9933"
-      - "9944:9944"
-