MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing staging build so it only occurs on develop, master doesn't need it.

This commit is contained in:
mike12345567 2021-06-07 18:04:16 +01:00
parent 482dd8f63f
commit 2a6da34404
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/budibase_ci.yml vendored
View File

@ -45,9 +45,10 @@ jobs:
- name: Build and Push Staging Docker Image - name: Build and Push Staging Docker Image
# Only run on push # Only run on push
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/develop' }}
run: | run: |
docker login -u $DOCKER_USER -p $DOCKER_PASSWORD docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
yarn build
yarn build:docker:staging yarn build:docker:staging
env: env:
DOCKER_USER: ${{ secrets.DOCKER_USERNAME }} DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}

2
hosting/scripts/linux/release-to-docker-hub.sh
View File

@ -3,7 +3,7 @@
tag=$1 tag=$1
tag=${tag:-latest} tag=${tag:-latest}
echo "Tagging images with SHA: $GITHUB_SHA and version: $BUDIBASE_VERSION" echo "Tagging images with SHA: $GITHUB_SHA and tag: $tag"
docker tag app-service budibase/apps:$tag docker tag app-service budibase/apps:$tag
docker tag worker-service budibase/worker:$tag docker tag worker-service budibase/worker:$tag