Skip to content

Commit ed65477

Browse files
lesvdpebot
authored andcommitted
Update instance names to 1st gen & 2nd gen (#454)
1 parent bd6ee3c commit ed65477

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

appengine/cloudsql/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Developers Console](https://console.cloud.google.com/sql/instances). Alternative
99
2. Change the root password (under Access Control) and / or create a new user / password.
1010
3. Create a Database (under Databases) (or use MySQL with `gcloud sql connect <instance> --user=root`)
1111
4. Note the **Instance connection name** under Overview > properties
12-
(It will look like project:instance for v1 or project:region:zone for v2)
12+
(It will look like project:instance for 1st Generation or project:region:zone for 2nd Generation)
1313

1414
## Deploying
1515

1616
```bash
17-
$ mvn clean appengine:deploy -DINSTANCE_CONNECTION_NAME="instanceConnectionName" -Duser=root
17+
$ mvn clean appengine:deploy -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root
1818
-Dpassword=myPassword -Ddatabase=myDatabase
1919
```
2020

@@ -23,6 +23,7 @@ Or you can update the properties in `pom.xml`
2323
## Running locally
2424

2525
```bash
26-
$ mvn clean appengine:run -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase
26+
$ mvn clean appengine:run -DINSTANCE_CONNECTION_NAME=instanceConnectionName -Duser=root -Dpassword=myPassowrd -Ddatabase=myDatabase
2727
```
28-
28+
Note - you must use a local mysql instance for the 1st Generation instance and change the local Url
29+
in `src/main/webapp/WEB-INF/appengine-web.xml` to use your local server.

appengine/cloudsql/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<properties>
3232
<!-- INSTANCE_CONNECTION_NAME from Cloud Console > SQL > Instance Details > Properties
3333
or gcloud sql instances describe <instance>
34-
project:region:instance for Cloud SQL v2 or
35-
project:instance for Cloud SQL v1
34+
project:region:instance for Cloud SQL 2nd Generation or
35+
project:instance for Cloud SQL 1st Generation
3636
-->
3737
<INSTANCE_CONNECTION_NAME></INSTANCE_CONNECTION_NAME>
3838
<user>root</user>
39-
<password></password>
40-
<database></database>
39+
<password>myPassword</password>
40+
<database>sqldemo</database>
4141

4242
<!-- [START_EXCLUDE] -->
4343
<appengine.maven.plugin>1.0.0</appengine.maven.plugin>

0 commit comments

Comments
 (0)