Skip to content

Commit 885aac5

Browse files
committed
Simplifies Docker build paths and updates scripts
Builds images from the project's root instead of the editor folder Removes path-based workflow triggers Unifies editor script to not rely on subdirectory references
1 parent 7c593bb commit 885aac5

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

.github/workflows/docker-build.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@ name: Build and Push Docker Image
33
on:
44
push:
55
branches: [ main, develop ]
6-
paths:
7-
- 'editor/**'
8-
- '.github/workflows/docker-build.yml'
96
pull_request:
107
branches: [ main ]
11-
paths:
12-
- 'editor/**'
13-
148
# Allow manual trigger
159
workflow_dispatch:
1610

@@ -53,8 +47,8 @@ jobs:
5347
- name: Build and push Docker image
5448
uses: docker/build-push-action@v5
5549
with:
56-
context: ./editor
57-
file: ./editor/Dockerfile
50+
context: .
51+
file: ./Dockerfile
5852
push: true
5953
tags: ${{ steps.meta.outputs.tags }}
6054
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
- name: Build and push editor image
2121
run: |
22-
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest ./editor
22+
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest .
2323
docker push ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest
2424
2525
- name: Build and push editor-api image
2626
run: |
27-
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest ./editor/server
27+
docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest ./server/server
2828
docker push ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest
2929
3030
deploy-to-appservice:

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"validate": "node tools/validate.js",
77
"format": "node tools/format.js",
8-
"editor": "cd editor && npm run dev",
8+
"editor": "npm run dev",
99
"dev": "vite",
1010
"build": "vite build",
1111
"preview": "vite preview",

0 commit comments

Comments
 (0)