Skip to content
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.

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

Fixes for deprecated versions #10

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Demonstration of one way sync
Binary file modified frontend/.DS_Store
Binary file not shown.
7 changes: 3 additions & 4 deletions frontend/app/app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
runtime: go
api_version: go1
runtime: go111

handlers:

Expand All @@ -14,8 +13,8 @@ handlers:
static_dir: public/assets

- url: /.*
script: _go_app
script: auto
login: required

env_variables:
APP_TOPIC: 'fs2-items'
APP_TOPIC: 'fs2-items'
2 changes: 1 addition & 1 deletion frontend/build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ docker run --rm -it \
-v "$(dirname "$PWD")/build:/build" \
-v "$(dirname "$PWD")/app:/code" \
-v "$(dirname "$PWD")/vendor/src:/go/src/" \
golang:1.9 bash /build/go.sh
golang:1.11 bash /build/go.sh
2 changes: 1 addition & 1 deletion frontend/build/go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p $GOPATH/src/github.com/linuxacademy/frontend

cp -R /code/*.go $GOPATH/src/github.com/linuxacademy/frontend
cp -R /code/* $GOPATH/src/github.com/linuxacademy/frontend

cd $GOPATH/src/github.com/linuxacademy/frontend

Expand Down
2 changes: 1 addition & 1 deletion frontend/cloud/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ export GOPATH="$(dirname $PWD)/vendor"
# Build the code into the vendor dir.
bash ../build/build.sh

GOPATH="$(dirname "$PWD")/vendor" gcloud app deploy ../app/app.yaml -q
GOPATH="$(dirname "$PWD")/vendor" gcloud app deploy $GOPATH/src/github.com/linuxacademy/frontend/app.yaml -q
Binary file modified image_parser/.DS_Store
Binary file not shown.
3 changes: 2 additions & 1 deletion image_parser/deploy/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ SOURCE_LOCAL_FOLDER="../app"
gcloud beta functions deploy $FUNCTION_NAME \
--entry-point=imageParser \
--source=$SOURCE_LOCAL_FOLDER \
--stage-bucket=$PRIVATE_ASSETS \
--stage-bucket=$PRIVATE_ASSETS \
--runtime nodejs8 \
--trigger-resource=$PUB_SUB_TOPIC \
--trigger-event="google.pubsub.topic.publish" \
--project=$PROJECT_NAME \
Expand Down
4 changes: 2 additions & 2 deletions products/build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a multi-stage build. The first stage builds the app.
# The second stage copies the binary and adds it to a lightweight alpine container.
FROM golang:1.9
FROM golang:1.10

WORKDIR /go/src/github.com/linuxacademy/products
# Copy the application code to the working dir.
Expand All @@ -17,4 +17,4 @@ RUN apk --no-cache add ca-certificates
WORKDIR /root/
COPY --from=0 /go/src/github.com/linuxacademy/products/products.sql .
COPY --from=0 /tmp/app .
CMD ["./app"]
CMD ["./app"]
3 changes: 1 addition & 2 deletions products/cloud/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ gcloud beta container clusters create $PRODUCT_CLUSTER_NAME \
--project $PROJECT_NAME \
--zone $PROJECT_ZONE \
--no-enable-basic-auth \
--cluster-version "1.9.7-gke.3" \
--machine-type "n1-standard-1" \
--image-type "COS" \
--disk-type "pd-standard" \
Expand Down Expand Up @@ -165,4 +164,4 @@ spec:
minReplicas: 1
maxReplicas: 5
targetCPUUtilizationPercentage: 80
EOL
EOL