Merge branch 'master' of https://github.com/Budibase/budibase into infra/release-pipeline

.github/workflows/release.yml

@@ -2,12 +2,13 @@ name: Budibase Release
 
 on: 
  push:
-  branches:
+    branches:
-    - master
+      - master
  pull_request:
     branches:
       - master
 
+
 jobs:
   release:
     runs-on: ubuntu-latest 
@@ -33,8 +34,10 @@ jobs:
       #   run: yarn release
 
       - name: Build/release Docker images
+        run: | 
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          yarn build
+          yarn build:docker
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
-        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-        run: yarn build:docker

hosting/docker-compose.yaml

@@ -5,8 +5,7 @@ version: "3"
 services:
   app-service:
     restart: always
-    #build: ./build/server
+    image: budibase/apps
-    image: budibase/budibase-apps
     ports:
       - "${APP_PORT}:4002"
     environment:
@@ -30,8 +29,7 @@ services:
 
   worker-service:
     restart: always
-    #build: ./build/worker
+    image: budibase/worker
-    image: budibase/budibase-worker
     ports:
       - "${WORKER_PORT}:4003"
     environment:

hosting/scripts/linux/release-to-docker-hub.sh

@@ -3,20 +3,14 @@
 tag=$1
 tag=${tag:-latest}
 
-
-pushd ../../build
-docker-compose build --force app-service
-docker-compose build --force worker-service
-
 echo "Tagging images with SHA: $GITHUB_SHA and version: $BUDIBASE_VERSION"
 
-docker tag build_app-service budibase/apps:$tag
+docker tag app-service budibase/apps:$tag
-docker tag build_worker-service budibase/worker:$tag
+docker tag worker-service budibase/worker:$tag
 
 # Tag with git sha
-docker tag build_app-service budibase/apps:$GITHUB_SHA
+docker tag app-service budibase/apps:$GITHUB_SHA
-docker tag build_worker-service budibase/worker:$GITHUB_SHA
+docker tag worker-service budibase/worker:$GITHUB_SHA
 
 docker push budibase/apps
 docker push budibase/worker
-popd

package.json

@@ -38,7 +38,7 @@
     "format": "prettier --write \"{,!(node_modules)/**/}*.{js,jsx,svelte}\"",
     "test:e2e": "lerna run cy:test",
     "test:e2e:ci": "lerna run cy:ci",
-    "build:docker": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
+    "build:docker": "lerna run build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh && cd -",
     "build:docker:staging": "cd hosting/scripts/linux/ && ./release-to-docker-hub.sh staging && cd -"
   },
   "dependencies": {

packages/server/package.json

@@ -35,6 +35,7 @@
     "test": "jest --testPathIgnorePatterns=routes && yarn run test:integration",
     "test:integration": "jest --coverage --detectOpenHandles",
     "test:watch": "jest --watch",
+    "build:docker": "docker build . -t app-service",
     "run:docker": "node src/index",
     "dev:stack:up": "node scripts/dev/manage.js up",
     "dev:stack:down": "node scripts/dev/manage.js down",

packages/worker/package.json

@@ -13,6 +13,7 @@
   ],
   "scripts": {
     "run:docker": "node src/index.js",
+    "build:docker": "docker build . -t worker-service",
     "dev:stack:init": "node ./scripts/dev/manage.js init",
     "dev:builder": "npm run dev:stack:init && nodemon src/index.js",
     "test": "jest --runInBand"