diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..cec1ad6 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "gcp_demo_server/vendor/serverpod"] + path = gcp_demo_server/vendor/serverpod + url = git@github.com:serverpod/serverpod.git diff --git a/gcp_demo_server/gcp/terraform/main.tf b/gcp_demo_server/gcp/terraform/main.tf index 80199a2..669c291 100644 --- a/gcp_demo_server/gcp/terraform/main.tf +++ b/gcp_demo_server/gcp/terraform/main.tf @@ -42,6 +42,8 @@ module "serverpod_production" { # Makes it possible to SSH into the individual server instances. enable_ssh = true + + enable_storage = false } # module "serverpod_staging" { diff --git a/gcp_demo_server/pubspec.lock b/gcp_demo_server/pubspec.lock index d7b6d82..d4e39d4 100644 --- a/gcp_demo_server/pubspec.lock +++ b/gcp_demo_server/pubspec.lock @@ -172,43 +172,38 @@ packages: serverpod: dependency: "direct main" description: - name: serverpod - sha256: "01ec5ef2138d6c2413ec04e491ad9410dbe51aa1ebba09f67784bf0ce38008aa" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "vendor/serverpod/packages/serverpod" + relative: true + source: path + version: "1.0.0" serverpod_client: dependency: transitive description: - name: serverpod_client - sha256: "725f7e0d51b00043d50155a08dd3bcd0a0bae293305742bfc60c423e68186502" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "vendor/serverpod/packages/serverpod_client" + relative: true + source: path + version: "1.0.0" serverpod_serialization: dependency: transitive description: - name: serverpod_serialization - sha256: "47a73897f56f3d2fbf5694c571fb7d9dcaba772da848566baeb2b668715de266" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "vendor/serverpod/packages/serverpod_serialization" + relative: true + source: path + version: "1.0.0" serverpod_service_client: dependency: transitive description: - name: serverpod_service_client - sha256: "04f4db20f6b1e09fcfa1bbfbdc60f77ccd98b7cb49f694391d5ad28b1197940b" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "vendor/serverpod/packages/serverpod_service_client" + relative: true + source: path + version: "1.0.0" serverpod_shared: dependency: transitive description: - name: serverpod_shared - sha256: "83d60863390f788a32598cceeec1f0e6c2f3f430e9c96d3bfae9d11c799abc2e" - url: "https://pub.dev" - source: hosted - version: "1.0.1" + path: "vendor/serverpod/packages/serverpod_shared" + relative: true + source: path + version: "1.0.0" source_span: dependency: transitive description: @@ -281,6 +276,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" + uuid: + dependency: transitive + description: + name: uuid + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" + source: hosted + version: "3.0.7" vm_service: dependency: transitive description: diff --git a/gcp_demo_server/pubspec.yaml b/gcp_demo_server/pubspec.yaml index 953f634..3082ffe 100644 --- a/gcp_demo_server/pubspec.yaml +++ b/gcp_demo_server/pubspec.yaml @@ -7,7 +7,8 @@ environment: sdk: '>=2.17.0 <3.0.0' dependencies: - serverpod: ^1.0.1 + serverpod: + path: vendor/serverpod/packages/serverpod dev_dependencies: lints: ^2.0.0 diff --git a/gcp_demo_server/vendor/analysis_options.yaml b/gcp_demo_server/vendor/analysis_options.yaml new file mode 100644 index 0000000..2780017 --- /dev/null +++ b/gcp_demo_server/vendor/analysis_options.yaml @@ -0,0 +1,3 @@ +analyzer: + exclude: + - serverpod/** diff --git a/gcp_demo_server/vendor/serverpod b/gcp_demo_server/vendor/serverpod new file mode 160000 index 0000000..d175bf1 --- /dev/null +++ b/gcp_demo_server/vendor/serverpod @@ -0,0 +1 @@ +Subproject commit d175bf1bb28db407dd80d7c20f07fa4a4aecaa72