marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bumped compose version to .97

Browse Source
This commit is contained in:
frikky
2021-05-29 18:18:59 +02:00
parent 010659c86c
commit 35336663d7
12 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app_sdk/app_base.py
+1
View File
@@ -22,6 +22,7 @@ class AppBase:
# apikey is for the user / org
# authorization is for the specific workflow
self.url = os.getenv("CALLBACK_URL", "https://shuffler.io")
self.base_url = os.getenv("BASE_URL", "https://shuffler.io")
self.action = os.getenv("ACTION", "")
backend/app_sdk/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
NAME=shuffle-app_sdk
VERSION=0.8.95
VERSION=0.8.97
docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
backend/go-app/go.mod
+2 -2
View File
@@ -2,7 +2,7 @@ module shuffle
go 1.13
replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/shuffle-shared => ../../../../git/shuffle-shared
//replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
@@ -24,7 +24,7 @@ require (
github.com/elastic/go-elasticsearch/v7 v7.12.0 // indirect
github.com/elastic/go-elasticsearch/v8 v8.0.0-20210519083322-55daf7425ecb // indirect
github.com/frikky/kin-openapi v0.39.0
github.com/frikky/shuffle-shared v0.0.52
github.com/frikky/shuffle-shared v0.0.53
github.com/fsouza/go-dockerclient v1.7.2 // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-git/go-billy/v5 v5.0.0
backend/go-app/go.sum
+2
View File
@@ -163,6 +163,8 @@ github.com/frikky/shuffle-shared v0.0.51 h1:JrCGoRNj/LkAvSlkyx7tLv7ToNtJDIAqKqiA
github.com/frikky/shuffle-shared v0.0.51/go.mod h1:BknTfpun3qte5bumR3OqQHf9XWPIsyj8woiXCjIlbBc=
github.com/frikky/shuffle-shared v0.0.52 h1:sCSJl6WakYit32UjaRn0wsy4YhTBE6QZbCofYKtuATg=
github.com/frikky/shuffle-shared v0.0.52/go.mod h1:BknTfpun3qte5bumR3OqQHf9XWPIsyj8woiXCjIlbBc=
github.com/frikky/shuffle-shared v0.0.53 h1:TszF/PoJ3JrfEf7qCGdN0So3bDbofNxh4Fqqz1KlH7Q=
github.com/frikky/shuffle-shared v0.0.53/go.mod h1:BknTfpun3qte5bumR3OqQHf9XWPIsyj8woiXCjIlbBc=
github.com/fsouza/go-dockerclient v1.7.2 h1:bBEAcqLTkpq205jooP5RVroUKiVEWgGecHyeZc4OFjo=
github.com/fsouza/go-dockerclient v1.7.2/go.mod h1:+ugtMCVRwnPfY7d8/baCzZ3uwB0BrG5DB8OzbtxaRz8=
github.com/getkin/kin-openapi v0.8.0 h1:a6TQjTqwkyscC4/hShJX7WhCVE+4bi9lzw61XHQW5hE=
backend/go-app/walkoff.go
+6
View File
@@ -1246,6 +1246,12 @@ func getWorkflowLocal(fileId string, request *http.Request) ([]byte, error) {
//// New execution with firestore
func handleExecution(id string, workflow shuffle.Workflow, request *http.Request) (shuffle.WorkflowExecution, string, error) {
//go func() {
// log.Printf("\n\nPRE TIME: %s\n\n", time.Now().Format("2006-01-02 15:04:05"))
// _ = <-time.After(time.Second * 60)
// log.Printf("\n\nPOST TIME: %s\n\n", time.Now().Format("2006-01-02 15:04:05"))
//}()
ctx := context.Background()
if workflow.ID == "" || workflow.ID != id {
tmpworkflow, err := shuffle.GetWorkflow(ctx, id)
docker-compose.yml
+7 -7
View File
@@ -1,8 +1,8 @@
version: '3'
services:
frontend:
build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:0.8.96
#build: ./frontend
image: ghcr.io/frikky/shuffle-frontend:0.8.97
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.8.96
#build: ./backend
image: ghcr.io/frikky/shuffle-backend:0.8.97
container_name: shuffle-backend
hostname: ${BACKEND_HOSTNAME}
# Here for debugging:
@@ -50,7 +50,7 @@ services:
#- database
orborus:
#build: ./functions/onprem/orborus
image: ghcr.io/frikky/shuffle-orborus:0.8.91
image: ghcr.io/frikky/shuffle-orborus:0.8.97
container_name: shuffle-orborus
hostname: shuffle-orborus
networks:
@@ -58,8 +58,8 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- SHUFFLE_APP_SDK_VERSION=0.8.90
- SHUFFLE_WORKER_VERSION=0.8.90
- SHUFFLE_APP_SDK_VERSION=0.8.97
- SHUFFLE_WORKER_VERSION=0.8.97
- ORG_ID=${ORG_ID}
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT}
frontend/Dockerfile
+1 -1
View File
@@ -21,7 +21,7 @@ COPY ./*.json /usr/src/app/
RUN yarn build
# Production environment
FROM nginx:1.19
FROM nginx:1.21
RUN mkdir -p /usr/share/nginx/html/build
RUN mkdir -p /usr/share/nginx/html/css
frontend/src/views/Admin.jsx
+10
View File
@@ -226,7 +226,9 @@ const Admin = (props) => {
return response.json()
})
.then((responseJson) => {
setTimeout(() => {
handleGetOrg(org_id)
}, 1000)
})
.catch(error => {
alert.error("Err: " + error.toString())
@@ -262,7 +264,9 @@ const Admin = (props) => {
console.log("Cloud sync fail?")
}
setTimeout(() => {
return response.json()
}, 1000)
})
.then((responseJson) => {
if (!responseJson.success && responseJson.reason !== undefined) {
@@ -349,7 +353,9 @@ const Admin = (props) => {
} else {
alert.success("Successfully updated auth everywhere!")
setSelectedUserModalOpen(false)
setTimeout(() => {
getAppAuthentication()
}, 1000)
}
}),
)
@@ -505,7 +511,9 @@ const Admin = (props) => {
} else {
setLoginInfo("")
setModalOpen(false)
setTimeout(() => {
getUsers()
}, 1000)
}
}),
)
@@ -538,7 +546,9 @@ const Admin = (props) => {
} else {
setLoginInfo("")
setModalOpen(false)
setTimeout(() => {
getUsers()
}, 1000)
}
}),
)
frontend/src/views/AppCreator.jsx
+1 -1
View File
@@ -1478,7 +1478,7 @@ const AppCreator = (props) => {
const extraKeys =
<div style={{marginTop: 50}}>
<div style={{display: "flex"}}>
<Typography variant="body1">Add global headers or queries</Typography>
<Typography variant="body1">Extra configuration items</Typography>
{extraAuth.length === 0 ?
<Button color="primary" style={{maxWidth: 50, marginLeft: 15, }} variant="contained" onClick={() => {
console.log("ADD NEW!")
functions/onprem/orborus/orborus.go
+6
View File
@@ -122,11 +122,17 @@ func getThisContainerId() {
// https://docs.docker.com/engine/api/sdk/examples/
func deployWorker(image string, identifier string, env []string) {
// Binds is the actual "-v" volume.
// Max 20% CPU every second
hostConfig := &container.HostConfig{
LogConfig: container.LogConfig{
Type: "json-file",
Config: map[string]string{},
},
Resources: container.Resources{
CPUShares: 256,
CPUQuota: 25000,
CPUPeriod: 100000,
},
Binds: []string{
"/var/run/docker.sock:/var/run/docker.sock:rw",
},
functions/onprem/worker/build.sh
+1 -1
View File
@@ -1,5 +1,5 @@
NAME=shuffle-worker
VERSION=0.8.92
VERSION=0.8.97
echo "Running docker build with $NAME:$VERSION"
#CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .
functions/onprem/worker/worker.go
+5 -2
View File
@@ -199,14 +199,17 @@ func shutdown(workflowExecution shuffle.WorkflowExecution, nodeId string, reason
func deployApp(cli *dockerclient.Client, image string, identifier string, env []string, workflowExecution shuffle.WorkflowExecution) error {
// form basic hostConfig
ctx := context.Background()
// Max 10% CPU every second
hostConfig := &container.HostConfig{
LogConfig: container.LogConfig{
Type: "json-file",
Config: map[string]string{},
},
Resources: container.Resources{
CPUShares: 256,
CPUPeriod: 10000,
CPUShares: 128,
CPUQuota: 10000,
CPUPeriod: 100000,
},
}