Skip to content

Commit f2ea61f

Browse files
scopsyscopsy
committed
Codespaces support
Update devcontainer.json Update devcontainer.json Update devcontainer.json Update devcontainer.json Update devcontainer.json Update codespace-prebuilt.yml Mongo support for codespace Add PNPM Support Changed redis-data folder Update docker-compose.yml Remove redis from docker
1 parent 6272a10 commit f2ea61f

File tree

9 files changed

+32614
-22
lines changed

9 files changed

+32614
-22
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.3/containers/typescript-node/.devcontainer/base.Dockerfile
2-
31
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
4-
ARG VARIANT="16-bullseye"
5-
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
2+
ARG VARIANT=16-bullseye
3+
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
4+
5+
# Install MongoDB command line tools if on buster and x86_64 (arm64 not supported)
6+
ARG MONGO_TOOLS_VERSION=5.0
7+
RUN . /etc/os-release \
8+
&& if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \
9+
curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \
10+
&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \
11+
&& apt-get update && export DEBIAN_FRONTEND=noninteractive \
12+
&& apt-get install -y mongodb-database-tools mongodb-mongosh \
13+
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*; \
14+
fi
615

716
# [Optional] Uncomment this section to install additional OS packages.
817
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -12,5 +21,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
1221
# ARG EXTRA_NODE_VERSION=10
1322
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
1423

15-
# [Optional] Uncomment if you want to install more global node packages
16-
# RUN su node -c "npm install -g <your-package-list -here>"
24+
# [Optional] Uncomment if you want to install more global node modules
25+
# RUN su node -c "npm install -g <your-package-list-here>"
26+
27+
28+

‎.devcontainer/devcontainer.json‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
2-
// https://github.com/microsoft/vscode-dev-containers/tree/v0.202.3/containers/typescript-node
2+
// https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/javascript-node-mongo
3+
// Update the VARIANT arg in docker-compose.yml to pick a Node.js version
34
{
4-
"name": "Notifire ENV",
5-
"runArgs": ["--init"],
6-
"build": {
7-
"dockerfile": "Dockerfile",
8-
"args": {
9-
"VARIANT": "14"
10-
}
11-
},
5+
"name": "Notifire",
6+
"dockerComposeFile": "docker-compose.yml",
7+
"service": "app",
8+
"workspaceFolder": "/workspace",
129

13-
"postCreateCommand": ["yarn install && yarn bootstrap"],
10+
// Set *default* container specific settings.json values on container create.
11+
"settings": {},
1412

15-
// Set *default* container specific settings.json values on container create.
16-
"settings": {},
13+
// Add the IDs of extensions you want installed when the container is created.
14+
"extensions": [
15+
"dbaeumer.vscode-eslint",
16+
"mongodb.mongodb-vscode"
17+
],
1718

18-
// Add the IDs of extensions you want installed when the container is created.
19-
"extensions": ["dbaeumer.vscode-eslint"],
19+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
20+
"forwardPorts": [4200, 3000, 27017],
2021

21-
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
22-
"remoteUser": "node"
22+
"onCreateCommand": ["yarn", "install"],
23+
"postCreateCommand": ["yarn", "start"],
24+
25+
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
26+
"remoteUser": "node",
27+
"features": {
28+
"github-cli": "latest"
29+
}
2330
}

‎.devcontainer/docker-compose.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
version: '3.8'
2+
3+
services:
4+
app:
5+
build:
6+
context: .
7+
dockerfile: Dockerfile
8+
args:
9+
# Update 'VARIANT' to pick an LTS version of Node.js: 16, 14, 12.
10+
# Append -bullseye or -buster to pin to an OS version.
11+
# Use -bullseye variants on local arm64/Apple Silicon.
12+
VARIANT: 16-bullseye
13+
volumes:
14+
- ..:/workspace:cached
15+
16+
# Overrides default command so things don't shut down after the process ends.
17+
command: sleep infinity
18+
19+
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
20+
network_mode: service:db
21+
# Uncomment the next line to use a non-root user for all processes.
22+
# user: node
23+
24+
# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
25+
# (Adding the "ports" property to this file will not forward from a Codespace.)
26+
27+
db:
28+
image: mongo:latest
29+
restart: unless-stopped
30+
volumes:
31+
- mongodb-data:/data/db
32+
# Uncomment to change startup options
33+
# environment:
34+
# MONGO_INITDB_ROOT_USERNAME: root
35+
# MONGO_INITDB_ROOT_PASSWORD: example
36+
# MONGO_INITDB_DATABASE: your-database-here
37+
38+
# Add "forwardPorts": ["27017"] to **devcontainer.json** to forward MongoDB locally.
39+
# (Adding the "ports" property to this file will not forward from a Codespace.)
40+
41+
volumes:
42+
mongodb-data: null

‎.github/workflows/codespace-prebuilt.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: precache codespace
2+
on:
3+
push:
4+
branches:
5+
- master
6+
workflow_dispatch:
7+
jobs:
8+
createPrebuild:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: github/codespaces-precache@v1-stable
13+
with:
14+
regions: WestEurope
15+
sku_name: standardLinux32gb
16+
env:
17+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎apps/api/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
"test:e2e": "cross-env TZ=UTC NODE_ENV=test mocha --timeout 10000 --require ts-node/register --exit --file e2e/setup.ts e2e/**/*.e2e.ts src/**/*.e2e.ts"
2020
},
2121
"dependencies": {
22+
"@aws-sdk/client-s3": "^3.14.0",
23+
"@aws-sdk/s3-request-presigner": "^3.14.0",
2224
"@godaddy/terminus": "^4.3.1",
2325
"@nestjs/common": "^7.6.12",
2426
"@nestjs/core": "^7.6.12",
@@ -33,6 +35,7 @@
3335
"@notifire/node": "^1.0.4",
3436
"@notifire/shared": "^0.3.3",
3537
"@notifire/testing": "^0.3.3",
38+
"@sendgrid/mail": "^7.6.0",
3639
"@sentry/node": "^6.1.0",
3740
"@sentry/tracing": "^6.3.6",
3841
"@types/handlebars": "^4.1.0",
@@ -47,6 +50,7 @@
4750
"hat": "^0.0.3",
4851
"jsonwebtoken": "^8.5.1",
4952
"lodash": "^4.17.15",
53+
"mixpanel": "^0.13.0",
5054
"moment": "^2.29.1",
5155
"nanoid": "^3.1.20",
5256
"nest-raven": "^7.2.0",
@@ -60,6 +64,7 @@
6064
"shortid": "^2.2.16",
6165
"slugify": "^1.4.6",
6266
"swagger-ui-express": "^4.1.4",
67+
"twilio": "^3.72.0",
6368
"typescript": "^4.1.3",
6469
"uuid": "^8.3.2"
6570
},

‎apps/web/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"dependencies": {
66
"@ant-design/icons": "^4.6.2",
77
"@auth0/nextjs-auth0": "^0.16.0",
8+
"@babel/plugin-proposal-optional-chaining": "^7.16.5",
9+
"@babel/plugin-transform-runtime": "^7.16.5",
810
"@craco/craco": "^6.1.1",
911
"@cypress/react": "^5.3.2",
1012
"@cypress/webpack-dev-server": "^1.1.2",
@@ -24,12 +26,14 @@
2426
"ace-builds": "^1.4.12",
2527
"antd": "^4.10.0",
2628
"autoprefixer": "^9.8.6",
29+
"axios": "^0.21.1",
2730
"babel-plugin-import": "^1.13.3",
2831
"graphql": "^15.4.0",
2932
"history": "^5.0.0",
3033
"jwt-decode": "^3.1.2",
3134
"less": "^4.1.0",
3235
"lodash.capitalize": "^4.2.1",
36+
"moment": "^2.29.1",
3337
"polished": "^4.1.3",
3438
"react": "^17.0.1",
3539
"react-ace": "^9.4.3",
@@ -40,6 +44,7 @@
4044
"react-editor-js": "^1.9.0",
4145
"react-hook-form": "^7.2.3",
4246
"react-query": "^3.5.16",
47+
"react-router": "5.2.0",
4348
"react-router-dom": "^5.2.0",
4449
"react-scripts": "4.0.3",
4550
"react-syntax-highlighter": "^15.4.3",

‎apps/widget/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"@types/react-dom": "^16.9.8",
1616
"antd": "^4.10.0",
1717
"axios": "^0.21.1",
18+
"babel-plugin-import": "^1.13.3",
1819
"iframe-resizer": "^4.3.1",
1920
"jwt-decode": "^3.1.2",
2021
"moment": "^2.29.1",
@@ -24,6 +25,7 @@
2425
"react-infinite-scroll-component": "^6.0.0",
2526
"react-infinite-scroller": "^1.2.4",
2627
"react-query": "^3.12.1",
28+
"react-refresh": "^0.11.0",
2729
"react-router-dom": "^5.2.0",
2830
"react-scripts": "4.0.1",
2931
"socket.io-client": "2.3.1",

0 commit comments

Comments
 (0)