Merge branch 'nightly' of https://github.com/shuffle/shuffle into nightly
This commit is contained in:
@@ -3,6 +3,19 @@
|
||||
[](https://shuffler.io)
|
||||
|
||||
Shuffle Automation
|
||||
<div>
|
||||
<a
|
||||
href="https://console.cloud.google.com/marketplace/product/shuffle-public/shuffle"
|
||||
target="_blank"
|
||||
style="text-decoration: none; display: flex; align-items: center; gap: 8px;"
|
||||
>
|
||||
<img
|
||||
src="https://upload.wikimedia.org/wikipedia/commons/5/51/Google_Cloud_logo.svg"
|
||||
height="20"
|
||||
alt="Google Cloud Platform"
|
||||
/>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</h1><h4 align="center">
|
||||
|
||||
@@ -28,46 +41,6 @@ Follow us on Twitter at [@shuffleio](https://twitter.com/shuffleio).
|
||||
|
||||
**Shuffle can be deployed using the following cloud marketplaces:**
|
||||
|
||||
<ul>
|
||||
<li style="display: flex; align-items: center;">
|
||||
<a
|
||||
href="https://console.cloud.google.com/marketplace/product/shuffle-public/shuffle"
|
||||
target="_blank"
|
||||
style="text-decoration: none; display: flex; align-items: center; gap: 8px;"
|
||||
>
|
||||
<img
|
||||
src="https://upload.wikimedia.org/wikipedia/commons/5/51/Google_Cloud_logo.svg"
|
||||
height="20"
|
||||
alt="Google Cloud Platform"
|
||||
/>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
<li style="display: flex; align-items: center; gap: 8px;">
|
||||
<img
|
||||
src="https://upload.wikimedia.org/wikipedia/commons/9/93/Amazon_Web_Services_Logo.svg"
|
||||
height="20"
|
||||
alt="Amazon Web Services"
|
||||
style="opacity: 0.4;"
|
||||
/>
|
||||
<span style="color: #6a737d; font-size: 12px;">
|
||||
Coming soon
|
||||
</span>
|
||||
</li>
|
||||
|
||||
<li style="display: flex; align-items: center; gap: 8px;">
|
||||
<img
|
||||
src="https://upload.wikimedia.org/wikipedia/commons/a/a8/Microsoft_Azure_Logo.svg"
|
||||
height="20"
|
||||
alt="Microsoft Azure"
|
||||
style="opacity: 0.4;"
|
||||
/>
|
||||
<span style="color: #6a737d; font-size: 12px;">
|
||||
Coming soon
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
## Try it
|
||||
* Self-hosted: Check out the [installation guide](https://github.com/shuffle/shuffle/blob/master/.github/install-guide.md)
|
||||
* Cloud: Register at https://shuffler.io/register and get cooking
|
||||
|
||||
@@ -4227,7 +4227,7 @@ func sendAppRequest(ctx context.Context, incomingUrl, appName string, port int,
|
||||
// Has some issues with loading when running multiple workers and such.
|
||||
func baseDeploy() {
|
||||
|
||||
//var cli *dockerclient.Client
|
||||
var cli *dockerclient.Client
|
||||
//var err error
|
||||
|
||||
if isKubernetes != "true" {
|
||||
@@ -4294,9 +4294,12 @@ func baseDeploy() {
|
||||
log.Printf("[DEBUG] Deploying app with identifier %s to ensure basic apps are available from the get-go", identifier)
|
||||
|
||||
//findAppInfo("frikky/shuffle:http_1.4.0", "http_1-4-0", true)
|
||||
go findAppInfo(value, identifier, false)
|
||||
// go findAppInfo(value, identifier, false)
|
||||
|
||||
//go deployApp(cli, value, identifier, env, workflowExecution, action)
|
||||
// findAppInfo leads to the following error:
|
||||
// Unable to list services: Cannot connect to the Docker daemon at unix:///var/run/docker.sock. Is the docker daemon running? (may continue anyway?)
|
||||
// Replaced with deployApp again. See https://github.com/Shuffle/Shuffle/issues/1817.
|
||||
go deployApp(cli, value, identifier, env, workflowExecution, action)
|
||||
//err := deployApp(cli, value, identifier, env, workflowExecution, action)
|
||||
//if err != nil {
|
||||
// log.Printf("[DEBUG] Failed deploying app %s: %s", value, err)
|
||||
|
||||
Reference in New Issue
Block a user