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

feat(soffit-pwa): deploy #659

Merged
merged 6 commits into from
Jan 18, 2023
Merged
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
9 changes: 7 additions & 2 deletions .github/workflows/publish-alwatr-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
dockerfile: cloud/container/alwatr-services.dockerfile
description: Alwatr Flight Crawler Nanoservice, Distributed simple and fast flight crawler nanoservice.

- image: form-registering
source: services/form-registering
- image: form-registration
source: services/form-registration
dockerfile: cloud/container/alwatr-services.dockerfile
description: Alwatr Form Registration API Nanoservice, Distributed simple and fast nanoservice for registering form information.

Expand All @@ -70,6 +70,11 @@ jobs:
dockerfile: cloud/container/alwatr-pwa.dockerfile
description: Alwatr Flight Finder PWA.

- image: soffit-pwa
source: uniquely/soffit-pwa
dockerfile: cloud/container/alwatr-pwa.dockerfile
description: Soffit PWA.

permissions:
contents: read
packages: write
Expand Down
10 changes: 5 additions & 5 deletions cloud/classic/flight-finder/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:

stop_grace_period: 30s

# restart: unless-stopped
restart: unless-stopped

networks:
internal:
Expand Down Expand Up @@ -44,7 +44,7 @@ services:
cpu_shares: 512
mem_limit: 256m

# restart: unless-stopped
restart: unless-stopped

networks:
internal:
Expand Down Expand Up @@ -77,7 +77,7 @@ services:
cpu_shares: 512
mem_limit: 256m

# restart: unless-stopped
restart: unless-stopped

networks:
internal:
Expand Down Expand Up @@ -108,7 +108,7 @@ services:
cpu_shares: 1024
mem_limit: 256m

# restart: unless-stopped
restart: unless-stopped

networks:
internal:
Expand Down Expand Up @@ -144,7 +144,7 @@ services:
cpu_shares: 1024
mem_limit: 256m

# restart: unless-stopped
restart: unless-stopped

networks:
alwatr-public-network:
Expand Down
2 changes: 1 addition & 1 deletion cloud/classic/soffit-form/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
max-file: '2'

api:
image: ghcr.io/alimd/form-registering:${API_VERSION:-next}
image: ghcr.io/alimd/form-registration:${API_VERSION:-next}

cpu_shares: 1024
mem_limit: 256m
Expand Down
30 changes: 30 additions & 0 deletions cloud/classic/soffit-pwa/compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
networks:
internal:
alwatr-public-network:
name: alwatr-public-network
external: true

services:
pwa:
image: ghcr.io/alimd/soffit-pwa:${PWA_VERSION:-next}

cpu_shares: 1024
mem_limit: 256m

restart: unless-stopped

networks:
alwatr-public-network:

logging:
driver: json-file
options:
max-size: '10m'
max-file: '2'

labels:
traefik.enable: true
traefik.port: 80
traefik.frontend.rule: Host:${PWA_DOMAIN}
traefik.frontend.entryPoints: http, https
traefik.frontend.redirect.entryPoint: https
3 changes: 3 additions & 0 deletions cloud/classic/soffit-pwa/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

source ../lib/deploy.sh
4 changes: 4 additions & 0 deletions cloud/classic/soffit-pwa/env/example.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
U2FsdGVkX1/XLv/cJZgBXKSOMQEV/GgZ4TxQbEhx4SOiY0y6KHFM+4RrW4UUOehh
yFisx7apY3qUiwAw8GpOzOQQZ4ciVt61ZewMK973ujmQnNgdDRN78AXaeIbujhtQ
p63YL5HLF6feDqLUW3VUo/AEgTuSDw6xrC10OIDbfmEsUQaoyL6gGOub5Atz60UG
DsGIL4FfFcP2TgysU+CCaLV89/Ut7/TpD992R+0eaNM=
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"repository": {
"type": "git",
"url": "https://github.com/AliMD/alwatr",
"directory": "services/form"
"directory": "services/form-registration"
},
"homepage": "https://github.com/AliMD/alwatr/tree/main/services/form#readme",
"homepage": "https://github.com/AliMD/alwatr/tree/main/services/form-registration#readme",
"bugs": {
"url": "https://github.com/AliMD/alwatr/issues"
},
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
{"path": "./services/flight-crawler"},
{"path": "./services/storage-server"},
{"path": "./services/comment"},
{"path": "./services/form-registering"},
{"path": "./services/form-registration"},

// uniquely
{"path": "./uniquely/flight-finder-api"},
{"path": "./uniquely/flight-finder-pwa"},
{"path": "./uniquely/soffit-site-pwa"},
{"path": "./uniquely/soffit-pwa"},
{"path": "./ui/demo-pwa"},

// labs
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@alwatr/soffit-site-pwa",
"name": "@alwatr/soffit-pwa",
"version": "0.27.0",
"description": "A good ceiling is vital. But a SOFFIT ceiling can be an inspiration.",
"type": "module",
Expand All @@ -17,7 +17,7 @@
"repository": {
"type": "git",
"url": "https://github.com/AliMD/alwatr",
"directory": "ui/soffit-site-pwa"
"directory": "ui/soffit-pwa"
},
"scripts": {
"b": "yarn build --debug",
Expand Down