From 284b3f61d90e1cc0b9713f272edab28231dcab0e Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Sun, 21 Apr 2019 13:33:31 -0700 Subject: [PATCH 1/4] chore: add Dockerfile --- site/Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 site/Dockerfile diff --git a/site/Dockerfile b/site/Dockerfile new file mode 100644 index 0000000000..6674e45336 --- /dev/null +++ b/site/Dockerfile @@ -0,0 +1,21 @@ +FROM mhart/alpine-node:10.15 + +# install dependencies +WORKDIR /app +COPY static /app/static +COPY content /app/content +COPY __sapper__ /app/__sapper__ +COPY package.json package-lock.json /app/ +RUN npm install --production + +### +# Only copy over the Node pieces we need +# ~> Saves 35MB +### +FROM mhart/alpine-node:base-10.15 + +WORKDIR /app +COPY --from=0 /app . + +EXPOSE 3000 +CMD ["node", "__sapper__/build"] From 2b9b2362b740901ef55544677bc41e6c8dac3db0 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Sun, 21 Apr 2019 13:33:43 -0700 Subject: [PATCH 2/4] chore: add Makefile recipes --- site/Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 site/Makefile diff --git a/site/Makefile b/site/Makefile new file mode 100644 index 0000000000..5c609a35d1 --- /dev/null +++ b/site/Makefile @@ -0,0 +1,24 @@ +HASH := `git rev-parse --short HEAD` + +SERVICE := svelte-website +PROJECT := todo_google_project_name + +IMAGE := gcr.io/$(PROJECT)/$(SERVICE):$(HASH) + +sapper: + @echo "\n~> updating template & contributors list" + @npm run update + @echo "\n~> building Sapper app" + @npm run sapper + + +docker: + @echo "\n~> building docker image" + @docker build . -t $(IMAGE) + @echo "\n~> pushing docker image" + @docker push $(IMAGE) + + +deploy: sapper docker + @echo "\n~> deploying $(SERVICE) to Cloud Run servers" + @gcloud beta run deploy $(SERVICE) --allow-unauthenticated --region us-central1 --image $(IMAGE) --memory=512Mi From 31d99eb2a76a99abf0336b989c096678153dfa00 Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Sun, 21 Apr 2019 13:34:50 -0700 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20remove=20old=20=E2=80=9Cdeploy?= =?UTF-8?q?=E2=80=9D=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/site/package.json b/site/package.json index d22683478a..a0fbd9f84a 100644 --- a/site/package.json +++ b/site/package.json @@ -11,10 +11,7 @@ "cy:run": "cypress run", "cy:open": "cypress open", "test": "run-p --race dev cy:run", - "testsrc": "mocha -r esm test/**", - "deploy": "npm run stage && now alias", - "prestage": "npm run update && npm run sapper", - "stage": "now" + "testsrc": "mocha -r esm test/**" }, "dependencies": { "codemirror": "^5.44.0", From a5575b3fd3806a0426be7dd27985fcae14153a6e Mon Sep 17 00:00:00 2001 From: Richard Harris Date: Sun, 21 Apr 2019 19:07:20 -0400 Subject: [PATCH 4/4] add project name --- site/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/Makefile b/site/Makefile index 5c609a35d1..c41be0fda7 100644 --- a/site/Makefile +++ b/site/Makefile @@ -1,7 +1,7 @@ HASH := `git rev-parse --short HEAD` SERVICE := svelte-website -PROJECT := todo_google_project_name +PROJECT := svelte-dev IMAGE := gcr.io/$(PROJECT)/$(SERVICE):$(HASH)