Skip to content

Memorystore GCE : Replace GCS_APP_LOCATION with GCS_BUCKET_NAME #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2018
Merged

Memorystore GCE : Replace GCS_APP_LOCATION with GCS_BUCKET_NAME #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions memorystore/redis/gce_deployment/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# [START memorystore_deploy_sh]
if [ -z "$GCS_APP_LOCATION" ]; then
if [ -z "$BUCKET"]; then
echo "Must set \$BUCKET. For example: BUCKET=my-bucket-name"
if [ -z "$GCS_BUCKET_NAME" ]; then
echo "Must set \$GCS_BUCKET_NAME. For example: GCS_BUCKET_NAME=my-bucket"
exit 1
fi
GCS_APP_LOCATION="gs://$BUCKET/gce/"
echo $GCS_APP_LOCATION
fi

if [ -z "$ZONE" ]; then
Expand All @@ -37,7 +33,7 @@ cd ..
mvn clean package

#Copy the WAR artifact to the GCS bucket location
gsutil cp -r target/${WAR} ${GCS_APP_LOCATION}
gsutil cp -r target/${WAR} gs://"$GCS_BUCKET_NAME"/gce/

cd gce_deployment

Expand All @@ -48,7 +44,7 @@ gcloud compute instances create my-instance \
--machine-type=g1-small \
--scopes cloud-platform \
--metadata-from-file startup-script=startup-script.sh \
--metadata app-location=${GCS_APP_LOCATION},app-war=$WAR \
--metadata gcs-bucket=$GCS_BUCKET_NAME,app-war=$WAR \
--zone $ZONE \
--tags http-server

Expand Down
4 changes: 2 additions & 2 deletions memorystore/redis/gce_deployment/startup-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ set -ex

# Talk to the metadata server to get the project id and location of application binary.
PROJECTID=$(curl -s "http://metadata.google.internal/computeMetadata/v1/project/project-id" -H "Metadata-Flavor: Google")
GCS_APP_LOCATION=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/app-location" -H "Metadata-Flavor: Google")
GCS_BUCKET_NAME=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/gcs-bucket" -H "Metadata-Flavor: Google")
WAR=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/attributes/app-war" -H "Metadata-Flavor: Google")

gsutil cp "$GCS_APP_LOCATION"** .
gsutil cp gs://"$GCS_BUCKET_NAME"/gce/"$WAR" .

# Install dependencies from apt
apt-get update
Expand Down