Skip to content

Commit

Permalink
update manifests to v1.1.0-beta.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shahidhk committed Jan 14, 2020
1 parent feb4a05 commit 05b352e
Show file tree
Hide file tree
Showing 12 changed files with 113 additions and 13 deletions.
31 changes: 28 additions & 3 deletions cli/assets/assets.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

75 changes: 75 additions & 0 deletions cli/assets/v1.1/console.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="https://graphql-engine-cdn.hasura.io/console/assets/common/img/favicon_green.png" />
<script>
window.__env = {
apiHost: {{.apiHost}},
apiPort: "{{.apiPort}}",
cliVersion: {{.cliVersion}},
dataApiUrl: {{.dataApiUrl}},
dataApiVersion: {{.dataApiVersion}},
{{- if .hasAccessKey }}
accessKey: {{.adminSecret}},
{{ else }}
adminSecret: {{.adminSecret}},
{{ end -}}
urlPrefix: "/",
consoleMode: "cli",
cliUUID: {{.cliUUID}},
enableTelemetry: {{.enableTelemetry}},
assetsPath: "https://graphql-engine-cdn.hasura.io/console/assets",
serverVersion: "{{.serverVersion}}",
};
</script>
</head>
<body>
<style>
.mainContent {
display: 'none';
opacity: 0;
transition: opacity .20s linear;
}
.mainContent.show {
display: 'block';
opacity: 1;
transition: opacity .20s linear;
}
</style>

<div id="loading">
<div class="page-loading" style="
min-height: 100vh;
width: 100%;
display: flex;
align-items: center;
font-family: sans-serif;
justify-content: center;
">
<span class="" style="
font-size: 2em;
margin-top: -3em;
color: #848484;
">
Loading...
</span>
</div>
</div>
<div id="content" class="mainContent"></div>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css"/>

{{ if .cliStaticDir }}

<link rel="stylesheet" href="/static/main.css" charset="UTF-8"/>
<script src="/static/vendor.js" charset="UTF-8"></script>
<script src="/static/main.js" charset="UTF-8"></script>

{{ else }}

<link rel="stylesheet" href="https://graphql-engine-cdn.hasura.io/console/assets/{{.assetsVersion}}/main.css.gz" charset="UTF-8"/>
<script src="https://graphql-engine-cdn.hasura.io/console/assets/{{.assetsVersion}}/vendor.js.gz" charset="UTF-8"></script>
<script src="https://graphql-engine-cdn.hasura.io/console/assets/{{.assetsVersion}}/main.js.gz" charset="UTF-8"></script>

{{ end }}

</body>
</html>
2 changes: 1 addition & 1 deletion install-manifests/azure-container-with-pg/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"firewallRuleName": "allow-all-azure-firewall-rule",
"containerGroupName": "[concat(parameters('name'), '-container-group')]",
"containerName": "hasura-graphql-engine",
"containerImage": "hasura/graphql-engine:v1.0.0"
"containerImage": "hasura/graphql-engine:v1.1.0-beta.1"
},
"resources": [
{
Expand Down
2 changes: 1 addition & 1 deletion install-manifests/azure-container/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"dbName": "[parameters('postgresDatabaseName')]",
"containerGroupName": "[concat(parameters('name'), '-container-group')]",
"containerName": "hasura-graphql-engine",
"containerImage": "hasura/graphql-engine:v1.0.0"
"containerImage": "hasura/graphql-engine:v1.1.0-beta.1"
},
"resources": [
{
Expand Down
2 changes: 1 addition & 1 deletion install-manifests/docker-compose-https/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
volumes:
- db_data:/var/lib/postgresql/data
graphql-engine:
image: hasura/graphql-engine:v1.0.0
image: hasura/graphql-engine:v1.1.0-beta.1
depends_on:
- "postgres"
restart: always
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
PGADMIN_DEFAULT_EMAIL: [email protected]
PGADMIN_DEFAULT_PASSWORD: admin
graphql-engine:
image: hasura/graphql-engine:v1.0.0
image: hasura/graphql-engine:v1.1.0-beta.1
ports:
- "8080:8080"
depends_on:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
volumes:
- db_data:/var/lib/postgresql/data
graphql-engine:
image: hasura/graphql-engine:v1.0.0
image: hasura/graphql-engine:v1.1.0-beta.1
ports:
- "8080:8080"
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion install-manifests/docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
volumes:
- db_data:/var/lib/postgresql/data
graphql-engine:
image: hasura/graphql-engine:v1.0.0
image: hasura/graphql-engine:v1.1.0-beta.1
ports:
- "8080:8080"
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion install-manifests/docker-run/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
docker run -d -p 8080:8080 \
-e HASURA_GRAPHQL_DATABASE_URL=postgres://username:password@hostname:port/dbname \
-e HASURA_GRAPHQL_ENABLE_CONSOLE=true \
hasura/graphql-engine:v1.0.0
hasura/graphql-engine:v1.1.0-beta.1
2 changes: 1 addition & 1 deletion install-manifests/google-cloud-k8s-sql/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: graphql-engine
image: hasura/graphql-engine:v1.0.0
image: hasura/graphql-engine:v1.1.0-beta.1
ports:
- containerPort: 8080
readinessProbe:
Expand Down
2 changes: 1 addition & 1 deletion install-manifests/kubernetes/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
app: hasura
spec:
containers:
- image: hasura/graphql-engine:v1.0.0
- image: hasura/graphql-engine:v1.1.0-beta.1
imagePullPolicy: IfNotPresent
name: hasura
env:
Expand Down
2 changes: 1 addition & 1 deletion scripts/cli-migrations/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hasura/graphql-engine:v1.0.0
FROM hasura/graphql-engine:v1.1.0-beta.1

# set an env var to let the cli know that
# it is running in server environment
Expand Down

0 comments on commit 05b352e

Please sign in to comment.