Skip to content

chore: rename flowforge-container #631

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.

Sign up for GitHub

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

Draft
hardillb wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

chore: rename flowforge-container #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad50bf4
chore: rename flowforge-container
hardillb Jul 4, 2025
bff964b
Update workflow files
hardillb Jul 4, 2025
73093a2
Fix label
hardillb Jul 4, 2025
800c333
Update dockerfile references in pipeline and Dockerfile
ppawlowski Jul 4, 2025
8c43fb0
Update input's names in container build workflow
ppawlowski Jul 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ jobs:
username: flowforge
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
# builds container
- name: Build and push FlowForge Application container
- name: Build and push FlowFuse Application container
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
context: helm/flowforge-container
file: helm/flowforge-container/Dockerfile
context: helm/flowfuse-container
file: helm/flowfuse-container/Dockerfile
platforms: linux/amd64, linux/arm64, linux/arm/v7
tags: ${{ steps.meta.outputs.tags }}
push: true
Expand All @@ -59,14 +59,14 @@ jobs:
repository: flowforge/forge-k8s
username: flowforge
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
readme-filepath: ./helm/flowforge-container/README.md
readme-filepath: ./helm/flowfuse-container/README.md
- name: Push README flowfuse
uses: peter-evans/dockerhub-description@432a30c9e07499fd01da9f8a49f0faf9e0ca5b77 # v4.0.2
with:
repository: flowfuse/forge-k8s
username: flowfuse
password: ${{ secrets.DOCKER_HUB_PASSWORD_FLOWFUSE }}
readme-filepath: ./helm/flowforge-container/README.md
readme-filepath: ./helm/flowfuse-container/README.md

build_nodered_container:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -351,7 +351,7 @@ jobs:
with:
username: flowforge
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
- name: Build and push FlowForge File Server container
- name: Build and push FlowFuse File Server container
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
with:
context: helm/file-server
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/flowforge-container.yml → .github/workflows/flowfuse-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ name: Flowforge - build and deploy
on:
workflow_dispatch:
inputs:
flowforge_release_name:
description: 'flowforge package version'
flowfuse_release_name:
description: 'flowfuse package version'
required: false
default: 'nightly'
flowforge_ref:
description: 'flowforge package ref'
flowfuse_ref:
description: 'flowfuse package ref'
required: false
push:
branches:
- main
paths:
- 'flowforge-container/**'
- '.github/workflows/flowforge-container.yml'
- 'flowfuse-container/**'
- '.github/workflows/flowfuse-container.yml'
pull_request:
branches:
- main
paths:
- 'flowforge-container/**'
- '.github/workflows/flowforge-container.yml'
- 'flowfuse-container/**'
- '.github/workflows/flowfuse-container.yml'

concurrency:
group: ${{ github.workflow }}-${{ github.ref_name }}
Expand All @@ -36,7 +36,7 @@ jobs:
package_dependencies: |
@flowfuse/flowfuse=nightly
@flowfuse/driver-kubernetes=nightly
build_context: 'flowforge-container'
build_context: 'flowfuse-container'
build_platform: "linux/amd64"
npm_registry_url: ${{ vars.PUBLIC_NPM_REGISTRY_URL }}
scan_image: false
Expand Down
2 changes: 1 addition & 1 deletion build-containers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ REGISTRY=$1

if [ ! -z "$REGISTRY" ]; then

docker build flowforge-container -t $REGISTRY/flowforge/forge-k8s:$TAG
docker build flowfuse-container -t $REGISTRY/flowforge/forge-k8s:$TAG
docker build node-red-container -t $REGISTRY/flowforge/node-red:$TAG
docker build file-server -t %REGISTRY/flowforge/file-server:$TAG

Expand Down
2 changes: 1 addition & 1 deletion file-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:20-alpine

ARG REGISTRY
ARG REGISTRY_TOKEN

Check warning on line 4 in file-server/Dockerfile

View workflow job for this annotation

GitHub Actions / Build single-architecture container images / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "REGISTRY_TOKEN")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
ARG TAG
RUN if [[ ! -z "$REGISTRY_TOKEN" ]]; then echo "//$REGISTRY/:_authToken=$REGISTRY_TOKEN" >> ~/.npmrc ; fi
RUN if [[ ! -z "$REGISTRY" ]] ; then npm config set @flowfuse:registry "https://$REGISTRY"; fi
Expand All @@ -20,7 +20,7 @@
org.label-schema.url="https://flowfuse.com" \
org.label-schema.vcs-type="Git" \
org.label-schema.vcs-url="https://github.com/flowfuse/helm" \
org.label-schema.docker.dockerfile="fileserver/Dockerfile" \
org.label-schema.docker.dockerfile="file-server/Dockerfile" \
org.schema-label.description="Collaborative, low code integration and automation environment" \
authors="FlowFuse Inc."

Expand Down
2 changes: 1 addition & 1 deletion flowforge-container/Dockerfile → flowfuse-container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL org.label-schema.name="FlowFuse Kubernetes" \
org.label-schema.url="https://flowfuse.com" \
org.label-schema.vcs-type="Git" \
org.label-schema.vcs-url="https://github.com/flowfuse/helm" \
org.label-schema.docker.dockerfile="flowforge-container/Dockerfile" \
org.label-schema.docker.dockerfile="flowfuse-container/Dockerfile" \
org.schema-label.description="Collaborative, low code integration and automation environment" \
authors="FlowFuse Inc."

Expand Down
0 flowforge-container/README.md → flowfuse-container/README.md
View file
Open in desktop
File renamed without changes.
0 flowforge-container/install-device-cache.sh → flowfuse-container/install-device-cache.sh
View file
Open in desktop
File renamed without changes.
0 flowforge-container/package.json → flowfuse-container/package.json
View file
Open in desktop
File renamed without changes.