From c06de1880d42a9964dc923f341d84667247a9792 Mon Sep 17 00:00:00 2001 From: Erin Grasmick Date: Tue, 28 Jul 2020 13:13:58 +0200 Subject: [PATCH 1/5] remove newline --- .github/workflows/backend.yml | 1 - .github/workflows/frontend.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 71d8d39..a55fb2f 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -22,7 +22,6 @@ jobs: - name: Build release and call executable working-directory: ./backend run: cargo run --release -- --help - - name: Build and Push template image working-directory: ./backend uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 4b707c7..ad9fdd4 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -36,7 +36,6 @@ jobs: - name: Build working-directory: ./frontend run: yarn build - - name: Build and Push template image working-directory: ./frontend uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action From 2c786a52f20fb43b17c3524e901bdd033dcec8c9 Mon Sep 17 00:00:00 2001 From: Erin Grasmick Date: Tue, 28 Jul 2020 13:18:15 +0200 Subject: [PATCH 2/5] trigger ci --- frontend/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6b1946e..d5bc187 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -10,7 +10,6 @@ RUN yarn install && \ yarn build && \ yarn cache clean - #### OUTPUT IMAGE #### FROM nginx:stable-alpine LABEL maintainer="Chevdor " From 2da071ae4728b8fc9e48d3ce561be9b97e3f8af3 Mon Sep 17 00:00:00 2001 From: Erin Grasmick Date: Tue, 28 Jul 2020 13:24:15 +0200 Subject: [PATCH 3/5] fix confusion action behavior --- .github/workflows/backend.yml | 3 +-- .github/workflows/frontend.yml | 3 +-- frontend/Dockerfile | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index a55fb2f..62e6c64 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -23,12 +23,11 @@ jobs: working-directory: ./backend run: cargo run --release -- --help - name: Build and Push template image - working-directory: ./backend uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: Dockerfile + dockerfile: ./backend/Dockerfile repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index ad9fdd4..179fdb6 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -37,12 +37,11 @@ jobs: working-directory: ./frontend run: yarn build - name: Build and Push template image - working-directory: ./frontend uses: docker/build-push-action@v1 # https://github.com/docker/build-push-action with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - dockerfile: Dockerfile + dockerfile: ./frontend/Dockerfile repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} tags: latest diff --git a/frontend/Dockerfile b/frontend/Dockerfile index d5bc187..6b1946e 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -10,6 +10,7 @@ RUN yarn install && \ yarn build && \ yarn cache clean + #### OUTPUT IMAGE #### FROM nginx:stable-alpine LABEL maintainer="Chevdor " From ef1e64959368480ad61231d42712aaaccece0822 Mon Sep 17 00:00:00 2001 From: Erin Grasmick Date: Tue, 28 Jul 2020 14:22:49 +0200 Subject: [PATCH 4/5] update README --- .github/workflows/backend.yml | 1 + .github/workflows/frontend.yml | 1 + README.md | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 62e6c64..c6f6b41 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -27,6 +27,7 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + path: ./backend/ dockerfile: ./backend/Dockerfile repository: parity/substrate-telemetry-backend push: ${{ startsWith(github.ref, 'refs/tags/') }} diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 179fdb6..21ace24 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -41,6 +41,7 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + path: ./frontend/ dockerfile: ./frontend/Dockerfile repository: parity/substrate-telemetry-frontend push: ${{ startsWith(github.ref, 'refs/tags/') }} diff --git a/README.md b/README.md index f2c03a1..9e8daee 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,8 @@ polkadot --dev --telemetry-url ws://localhost:8000/submit ## Docker +*Pre-built docker images are available at `parity/substrate-telemetry-frontend` and `parity/substrate-telemetry-backend`.* + ### Run the backend and frontend Obviously, the frontend need to be aware of the backend. In a similar way, your node will need to connect to the backend. From ba2a8d1ef152e2a433e5dbd4b77d14e7e3b838b7 Mon Sep 17 00:00:00 2001 From: Erin Grasmick Date: Tue, 28 Jul 2020 14:32:07 +0200 Subject: [PATCH 5/5] trigger ci --- frontend/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6b1946e..d5bc187 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -10,7 +10,6 @@ RUN yarn install && \ yarn build && \ yarn cache clean - #### OUTPUT IMAGE #### FROM nginx:stable-alpine LABEL maintainer="Chevdor "