From 30b7bc89ec4823868418a472eb420e9a7fdc4aeb Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 18 Jun 2021 16:53:28 +0200 Subject: [PATCH 1/2] docs: set env vars for deployment Signed-off-by: Andrea Luzzardi --- .dagger/env/docs/plan/main.cue | 7 +++++++ .dagger/env/docs/values.yaml | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.dagger/env/docs/plan/main.cue b/.dagger/env/docs/plan/main.cue index da62aa99..d3e07a73 100644 --- a/.dagger/env/docs/plan/main.cue +++ b/.dagger/env/docs/plan/main.cue @@ -14,6 +14,13 @@ docs: yarn.#Package & { source: repository cwd: "website/" buildDir: "website/build" + env: { + OAUTH_ENABLE: "true" + REACT_APP_OAUTH_SCOPE: "read:user" + REACT_APP_GITHUB_AUTHORIZE_URI: "https://github.com/login/oauth/authorize?client_id=${REACT_APP_CLIENT_ID}&scope=${REACT_APP_OAUTH_SCOPE}&allow_signup=false" + REACT_APP_DAGGER_SITE_URI: "https://dagger.io" + REACT_APP_API_PROXY_ENABLE: "true" + } } // Deploy the docs website diff --git a/.dagger/env/docs/values.yaml b/.dagger/env/docs/values.yaml index 49a35895..b906c082 100644 --- a/.dagger/env/docs/values.yaml +++ b/.dagger/env/docs/values.yaml @@ -1,3 +1,5 @@ +plan: + module: .dagger/env/docs/plan name: docs inputs: docs.env.REACT_APP_CLIENT_ID: @@ -30,8 +32,8 @@ sops: ejRKQXNFZzBTbUxpc05acnkxQ2U2UkEKX1byNj64xOiRGAJ9lwh55d/mlasI3H6H b+o3HbXSbV0G0UwQxEOisntR6o27ry/l12ai/sOQ4f9MXm6FRw2XTg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2021-06-15T07:57:28Z" - mac: ENC[AES256_GCM,data:PPeh8uZ4i8kRqgoDMLBlHMy3jFs0jQxJKdkeA3LTqbBKZ9EEEt9K4ASmZVbTUv5iumcoxaXc2u6ty0gDPaLjqnYPLMOzR962+5ipp96l1fzA7vvNpdNlUPweTo6WgQUBf/J4eOPBlm3O2pPi7Os+IlvnvM92ZL6Y9K3oOZqlnwU=,iv:Mz8jz3lBOEVqlqKEaqa5ujecr4B/IIaeW34Kx3cEwwE=,tag:feixK5kYE61WeEzJcXjRoA==,type:str] + lastmodified: "2021-06-18T14:46:35Z" + mac: ENC[AES256_GCM,data:RX4rZSP2sMqSGfbSkpK1rAqLcpYHv99jUvhGpQvM9Sjxki4LskxQP51BuZj7eVD0u0uqBMObatyZvofTybld6tlrgQeddIS4SINRJNsC+P7dzaiOEePZX/oCCMIQCnO8+OLO7z6DNdy1IMxhuCZWeGHDJt1ritLds3ACAjtFrGo=,iv:AI8tdLTFnFV919ypY0RKVaDNfwEN6b5hZuH4DvlhdAk=,tag:izIPuozRiYpQ50hi4yLyCw==,type:str] pgp: [] encrypted_suffix: secret version: 3.7.1 From c53e6c77ec1d1d1584dd6fca2023e3b48c255d3e Mon Sep 17 00:00:00 2001 From: Andrea Luzzardi Date: Fri, 18 Jun 2021 16:54:06 +0200 Subject: [PATCH 2/2] docs: netlify: disable auth for deploy preview, enable in production Signed-off-by: Andrea Luzzardi --- netlify.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index 1327a34c..80a56210 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,7 @@ [build] base = "website/" publish = "build/" - command = "yarn build:withoutAuth" + command = "yarn build" [context.production] # Do not build the site if there's no site-related changes since the last @@ -16,6 +16,7 @@ # Do not build the site if there's no site-related changes since the last # deploy. ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF . ../docs/ ../netlify.toml" + command = "yarn build:withoutAuth" [[redirects]] from = "/github-proxy/*"