Fixed app building issues

This commit is contained in:
frikky
2020-09-05 09:22:50 +02:00
parent 2633ff4b4d
commit b1eb0f5a08
6 changed files with 14 additions and 11 deletions
+1 -1
View File
@@ -5,9 +5,9 @@ VERSION=0.6.0
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
docker build . -t frikky/shuffle:$NAME -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/app_sdk:0.6.0
#docker push frikky/shuffle:$NAME
#docker push frikky/$NAME:$VERSION
#docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
#docker push ghcr.io/frikky/$NAME:$VERSION
docker push frikky/shuffle:$NAME
docker push ghcr.io/frikky/$NAME:$VERSION
+3 -3
View File
@@ -6155,7 +6155,7 @@ func createFs(basepath, pathname string) (billy.Filesystem, error) {
}
// Hotloads new apps from a folder
func handleAppHotload(location string) error {
func handleAppHotload(location string, forceUpdate bool) error {
basepath := "base"
fs, err := createFs(basepath, location)
if err != nil {
@@ -6172,7 +6172,7 @@ func handleAppHotload(location string) error {
}
//log.Printf("Reading app folder: %#v", dir)
err = iterateAppGithubFolders(fs, dir, "", "", false)
err = iterateAppGithubFolders(fs, dir, "", "", forceUpdate)
if err != nil {
log.Printf("Err: %s", err)
return err
@@ -6394,7 +6394,7 @@ func runInit(ctx context.Context) {
// Hotloads locally
location := os.Getenv("SHUFFLE_APP_HOTLOAD_FOLDER")
if len(location) != 0 {
handleAppHotload(location)
handleAppHotload(location, false)
}
}
+1 -1
View File
@@ -4313,7 +4313,7 @@ func handleAppHotloadRequest(resp http.ResponseWriter, request *http.Request) {
}
log.Printf("Hotloading from %s", location)
err = handleAppHotload(location)
err = handleAppHotload(location, true)
if err != nil {
resp.WriteHeader(500)
resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed loading apps: %s"}`)))
+6 -6
View File
@@ -1,8 +1,8 @@
version: '3'
services:
frontend:
#build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:0.7.0
build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:0.7.1
container_name: shuffle-frontend
hostname: shuffle-frontend
ports:
@@ -16,8 +16,8 @@ services:
depends_on:
- backend
backend:
#build: ./backend
image: ghcr.io/frikky/shuffle-backend:0.7.0
build: ./backend
image: ghcr.io/frikky/shuffle-backend:0.7.1
container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME}
# Here for debugging:
@@ -42,8 +42,8 @@ services:
depends_on:
- database
orborus:
#build: ./functions/onprem/orborus
image: ghcr.io/frikky/orborus:0.6.1
build: ./functions/onprem/orborus
image: ghcr.io/frikky/orborus:0.6.2
container_name: shuffle-orborus
hostname: shuffle-orborus
networks:
+2
View File
@@ -293,6 +293,7 @@ const AngularWorkflow = (props) => {
.then((response) => {
if (response.status !== 200) {
console.log("Status not 200 for stream results :O!")
stop()
}
return response.json()
@@ -302,6 +303,7 @@ const AngularWorkflow = (props) => {
})
.catch(error => {
alert.error(error.toString())
stop()
});
}
+1
View File
@@ -218,6 +218,7 @@ func initializeImages() {
fmt.Sprintf("%s/worker:%s", baseimagename, workerVersion),
fmt.Sprintf("%s/app_sdk:%s", baseimagename, appSdkVersion),
fmt.Sprintf("frikky/shuffle:app_sdk"),
}
pullOptions := types.ImagePullOptions{}