Merge branch 'master' into fix/bulk-delete

hasura · May 6, 2020 · 12b8b4d · 12b8b4d
2 parents d83eb9b + e14352e
commit 12b8b4d
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 11 deletions.
diff --git a/install-manifests/azure-container-with-pg/azuredeploy.json b/install-manifests/azure-container-with-pg/azuredeploy.json
@@ -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.2.0"
+    "containerImage": "hasura/graphql-engine:v1.2.1"
   },
   "resources": [
     {

diff --git a/install-manifests/azure-container/azuredeploy.json b/install-manifests/azure-container/azuredeploy.json
@@ -55,7 +55,7 @@
     "dbName": "[parameters('postgresDatabaseName')]",
     "containerGroupName": "[concat(parameters('name'), '-container-group')]",
     "containerName": "hasura-graphql-engine",
-    "containerImage": "hasura/graphql-engine:v1.2.0"
+    "containerImage": "hasura/graphql-engine:v1.2.1"
   },
   "resources": [
     {

diff --git a/install-manifests/docker-compose-https/docker-compose.yaml b/install-manifests/docker-compose-https/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v1.2.0
+    image: hasura/graphql-engine:v1.2.1
     depends_on:
     - "postgres"
     restart: always

diff --git a/install-manifests/docker-compose-pgadmin/docker-compose.yaml b/install-manifests/docker-compose-pgadmin/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
       PGADMIN_DEFAULT_EMAIL: pgadmin@example.com
       PGADMIN_DEFAULT_PASSWORD: admin
   graphql-engine:
-    image: hasura/graphql-engine:v1.2.0
+    image: hasura/graphql-engine:v1.2.1
     ports:
     - "8080:8080"
     depends_on:

diff --git a/install-manifests/docker-compose-postgis/docker-compose.yaml b/install-manifests/docker-compose-postgis/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v1.2.0
+    image: hasura/graphql-engine:v1.2.1
     ports:
     - "8080:8080"
     depends_on:

diff --git a/install-manifests/docker-compose/docker-compose.yaml b/install-manifests/docker-compose/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v1.2.0
+    image: hasura/graphql-engine:v1.2.1
     ports:
     - "8080:8080"
     depends_on:

diff --git a/install-manifests/docker-run/docker-run.sh b/install-manifests/docker-run/docker-run.sh
@@ -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.2.0
+       hasura/graphql-engine:v1.2.1
diff --git a/install-manifests/google-cloud-k8s-sql/deployment.yaml b/install-manifests/google-cloud-k8s-sql/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: graphql-engine
-          image: hasura/graphql-engine:v1.2.0
+          image: hasura/graphql-engine:v1.2.1
           ports:
             - containerPort: 8080
           readinessProbe:

diff --git a/install-manifests/kubernetes/deployment.yaml b/install-manifests/kubernetes/deployment.yaml
@@ -18,7 +18,7 @@ spec:
         app: hasura
     spec:
       containers:
-      - image: hasura/graphql-engine:v1.2.0
+      - image: hasura/graphql-engine:v1.2.1
         imagePullPolicy: IfNotPresent
         name: hasura
         env:

diff --git a/scripts/cli-migrations/v1/Dockerfile b/scripts/cli-migrations/v1/Dockerfile
@@ -1,4 +1,4 @@
-FROM hasura/graphql-engine:v1.2.0
+FROM hasura/graphql-engine:v1.2.1
 
 # set an env var to let the cli know that
 # it is running in server environment

diff --git a/scripts/cli-migrations/v2/Dockerfile b/scripts/cli-migrations/v2/Dockerfile
@@ -2,7 +2,7 @@ FROM hasura/haskell-docker-packager:20190731 as packager
 WORKDIR /tmp
 RUN apt-get update && apt-get download libstdc++6
 
-FROM hasura/graphql-engine:v1.2.0
+FROM hasura/graphql-engine:v1.2.1
 
 # install libstdc++6 from .deb file
 COPY --from=packager /tmp/libstdc++6* .

diff --git a/server/src-rsr/catalog_versions.txt b/server/src-rsr/catalog_versions.txt
@@ -21,3 +21,4 @@ v1.2.0-beta.3 34
 v1.2.0-beta.4 34
 v1.2.0-beta.5 34
 v1.2.0 34
+v1.2.1 34