diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 4f89c03..d7cae3d 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -1,5 +1,8 @@ name: Build and push containers on: + pull_request: + branches: + - main push: tags: - "v*.*.*" @@ -10,7 +13,6 @@ jobs: steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: - repository: 'flowforge/docker-compose' fetch-depth: 0 path: 'docker-compose' - name: Docker Meta Data @@ -33,7 +35,9 @@ jobs: with: username: flowforge password: ${{ secrets.DOCKER_HUB_PASSWORD }} + - name: Build and push FlowForge Application container + if: false uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0 with: context: docker-compose/flowforge-docker @@ -41,13 +45,15 @@ jobs: platforms: linux/amd64, linux/arm64, linux/arm/v7 tags: ${{ steps.meta.outputs.tags }} push: true + - name: Push README uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0 with: repository: flowforge/forge-docker username: flowforge password: ${{ secrets.DOCKER_HUB_PASSWORD }} - readme-filepath: docker-compose/README.md + readme-filepath: ${{ github.workspace }}/docker-compose/README.md + - name: Push README flowfuse uses: peter-evans/dockerhub-description@1b9a80c056b620d92cedb9d9b5a223409c68ddfa # v5.0.0 with: @@ -57,6 +63,7 @@ jobs: readme-filepath: docker-compose/README.md release-compose-files: + if: false runs-on: ubuntu-latest permissions: contents: write diff --git a/README.md b/README.md index 3d1d43e..bc4d92a 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ e.g. assuming that Docker is running on a machine with IP address `192.168.0.8` This will mean that any host at `example.com` will resolve to the `192.168.0.8`. -**Note** When testing locally you can not use the loopback address `127.0.0.1` for this, e.g. in the `/etc/hosts` file, as this will resolve to the TCP/IP stack inside each container. +**Note** When testing locally you can not use the loopback address `127.0.0.1` for this, e.g. in the [`hosts`](https://en.wikipedia.org/wiki/Hosts_(file)) file, as this will resolve to the TCP/IP stack inside each container. ## Installing FlowFuse @@ -124,6 +124,4 @@ other - including this repository. That will start the standard environment, but the `forge` container will have the local source tree mounted, and use `npm run serve` to start the code. This means - it will automatically rebuild/restart whenever source code changes are made. - - + it will automatically rebuild/restart whenever source code changes are made. \ No newline at end of file diff --git a/README2.md b/README2.md new file mode 100644 index 0000000..9d6673a --- /dev/null +++ b/README2.md @@ -0,0 +1,4 @@ +# FlowFuse Docker Compose + +An example Docker Compose project to run FlowFuse +