Skip to content

Commit f2f694b

Browse files
authored
Update deployment files after yarn workspace changes (#27)
1 parent a18caa6 commit f2f694b

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

deployment/auth.fly.dockerfile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,23 @@ RUN apt-get update && apt-get install nodejs -y
2121
RUN npm install --global yarn
2222

2323
# Copy packages
24-
COPY packages/authorization-server packages/authorization-server
25-
COPY packages/id-assert-authz-grant-client packages/id-assert-authz-grant-client
26-
27-
COPY package.json package.json
24+
# Need to keep code in separate working directory for yarn workspaces for some reason, not root path
2825
COPY .yarnrc.yml .yarnrc.yml
2926
COPY .yarn/releases .yarn/releases
30-
COPY yarn.lock yarn.lock
27+
28+
29+
RUN mkdir cwo-app
30+
WORKDIR cwo-app
31+
32+
RUN mkdir deployment
33+
RUN mkdir packages
3134
COPY deployment deployment
35+
COPY package.json package.json
36+
COPY yarn.lock yarn.lock
37+
COPY packages/authorization-server packages/authorization-server
38+
COPY packages/id-assert-authz-grant-client packages/id-assert-authz-grant-client
3239

3340
RUN yarn install
3441
RUN yarn postinstall
3542

36-
ENTRYPOINT ./deployment/start-auth.sh
43+
ENTRYPOINT deployment/start-auth.sh

deployment/todoauthsrv.fly.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ primary_region = "sjc"
1717
APP_RESOURCE="https://todo0.app/"
1818
CLIENT1_CALLBACK="https://todo0.app/api/openid/callback/"
1919
CUSTOMER1_EMAIL_DOMAIN="tables.fake"
20-
CUSTOMER1_AUTH_ISSUER="https://localgrid.clouditude.com"
2120

2221
[http_service]
2322
internal_port = 5001

deployment/wikiauthsrv.fly.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ primary_region = "sjc"
1717
APP_RESOURCE="https://wiki0.app/"
1818
CLIENT1_CALLBACK="https://wiki0.app/api/openid/callback/"
1919
CUSTOMER1_EMAIL_DOMAIN="tables.fake"
20-
CUSTOMER1_AUTH_ISSUER="https://localgrid.clouditude.com"
21-
USE_SAML_SSO="false"
22-
CUSTOMER1_SAML_ENTRY_POINT=""
23-
CUSTOMER1_SAML_ISSUER=""
24-
CUSTOMER1_SAML_CERTIFICATE=""
2520

2621
[http_service]
2722
internal_port = 5000

0 commit comments

Comments
 (0)