소스 검색

simplify docker-compose files

Mokhtar Naamani 4 년 전
부모
커밋
5f87dcd9e4
5개의 변경된 파일6개의 추가작업 그리고 10개의 파일을 삭제
  1. 0 2
      .env
  2. 2 3
      .github/workflows/joystream-node-docker.yml
  3. 2 3
      .github/workflows/run-network-tests.yml
  4. 1 1
      docker-compose-with-storage.yml
  5. 1 1
      docker-compose.yml

+ 0 - 2
.env

@@ -1,2 +0,0 @@
-# joystream/node default tag used in docker-compose.yml file
-JOYSTREAM_NODE_TAG=latest

+ 2 - 3
.github/workflows/joystream-node-docker.yml

@@ -41,9 +41,8 @@ jobs:
         continue-on-error: true
         run: |
           if ! [ -f joystream-node-docker-image.tar.gz ]; then
-            export JOYSTREAM_NODE_TAG=${{ steps.compute_shasum.outputs.shasum }}
-            docker pull joystream/node:${JOYSTREAM_NODE_TAG}
-            docker image tag joystream/node:${JOYSTREAM_NODE_TAG} joystream/node:latest
+            docker pull joystream/node:${{ steps.compute_shasum.outputs.shasum }}
+            docker image tag joystream/node:${{ steps.compute_shasum.outputs.shasum }} joystream/node:latest
             docker save --output joystream-node-docker-image.tar joystream/node:latest
             gzip joystream-node-docker-image.tar
             cp joystream-node-docker-image.tar.gz ~/docker-images/

+ 2 - 3
.github/workflows/run-network-tests.yml

@@ -54,9 +54,8 @@ jobs:
         continue-on-error: true
         run: |
           if ! [ -f joystream-node-docker-image.tar.gz ]; then
-            export JOYSTREAM_NODE_TAG=${{ steps.compute_shasum.outputs.shasum }}
-            docker pull joystream/node:${JOYSTREAM_NODE_TAG}
-            docker image tag joystream/node:${JOYSTREAM_NODE_TAG} joystream/node:latest
+            docker pull joystream/node:${{ steps.compute_shasum.outputs.shasum }}
+            docker image tag joystream/node:${{ steps.compute_shasum.outputs.shasum }} joystream/node:latest
             docker save --output joystream-node-docker-image.tar joystream/node:latest
             gzip joystream-node-docker-image.tar
             cp joystream-node-docker-image.tar.gz ~/docker-images/

+ 1 - 1
docker-compose-with-storage.yml

@@ -16,7 +16,7 @@ services:
         /sbin/tini -- /usr/local/bin/start_ipfs daemon --migrate=true
       "
   chain:
-    image: "joystream/node:${JOYSTREAM_NODE_TAG}"
+    image: joystream/node
     build:
       context: .
       dockerfile: joystream-node.Dockerfile

+ 1 - 1
docker-compose.yml

@@ -4,7 +4,7 @@
 version: "3"
 services:
   joystream-node:
-    image: "joystream/node:${JOYSTREAM_NODE_TAG}"
+    image: joystream/node
     build:
       # context is relative to the compose file
       context: .