Skip to content

Commit

Permalink
Merge pull request #84 from flowforge/fix-1.2
Browse files Browse the repository at this point in the history
Fix device agent Dockerfile path
  • Loading branch information
knolleary committed Dec 22, 2022
2 parents 840418d + 98a81db commit a0b917e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: helm/flowforge-device-agent
file: helm/node-red-container/Dockerfile
file: helm/flowforge-device-agent/Dockerfile
platforms: linux/amd64, linux/arm64, linux/arm/v7
tags: ${{ steps.meta.outputs.tags }}
push: true
Expand Down Expand Up @@ -238,4 +238,4 @@ jobs:
helm repo index --url https://flowforge.github.io/helm .
git add .
git commit -c user.name='FlowForge Build Bot' -c user.email='noreply@flowforge.com' -m "Add ${{ github.ref_name }} helm chart"
git push origin gh-pages
git push origin
3 changes: 3 additions & 0 deletions file-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ ARG TAG
RUN if [[ ! -z "$REGISTRY_TOKEN" ]]; then echo "//$REGISTRY/:_authToken=$REGISTRY_TOKEN" >> ~/.npmrc ; fi
RUN if [[ ! -z "$REGISTRY" ]] ; then npm config set @flowforge:registry "https://$REGISTRY"; fi

RUN apk add --no-cache --virtual build-base g++ make py3-pip sqlite-dev python3
RUN npm config set python `which python3` --global

WORKDIR /usr/src/flowforge-file-server
RUN mkdir app bin etc var
COPY package.json /usr/src/flowforge-file-server/app
Expand Down

0 comments on commit a0b917e

Please sign in to comment.