Skip to content

Commit 2322dc5

Browse files
authored
Merge branch 'development' into bugfix/197_change_class
2 parents dd7ddce + 1c9164d commit 2322dc5

16 files changed

+294
-532
lines changed

.github/workflows/firebase-deploy-development.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

.github/workflows/firebase-deploy.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

Dockerfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,26 @@ COPY . /app
77
WORKDIR /app
88

99
ARG ENV
10+
ARG APIKEY
11+
ARG AUTHDOMAIN
12+
ARG DATABASEURL
13+
ARG PROJECTID
14+
ARG STORAGEBUCKET
15+
ARG MESSAGINGSENDERID
16+
ARG APPID
17+
ARG MEASUREMENTID
18+
19+
ENV APIKEY $APIKEY
20+
ENV AUTHDOMAIN $AUTHDOMAIN
21+
ENV DATABASEURL $DATABASEURL
22+
ENV PROJECTID $PROJECTID
23+
ENV STORAGEBUCKET $STORAGEBUCKET
24+
ENV MESSAGINGSENDERID $MESSAGINGSENDERID
25+
ENV APPID $APPID
26+
ENV MEASUREMENTID $MEASUREMENTID
1027
ENV ENV $ENV
28+
ENV HOST 0.0.0.0
29+
ENV PORT 3000
1130

1231
RUN yarn && yarn build
1332

buildspec.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
version: 0.2
2+
3+
phases:
4+
pre_build:
5+
commands:
6+
- echo Logging in to Amazon ECR...
7+
- aws --version
8+
- REPOSITORY_URI=${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${IMAGE_NAME}
9+
- REGISTORY_URI=${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com
10+
- aws ecr get-login-password | docker login --username AWS --password-stdin ${REGISTORY_URI}
11+
- IMAGE_TAG=$(echo ${CODEBUILD_RESOLVED_SOURCE_VERSION} | cut -c 1-7)
12+
build:
13+
commands:
14+
- echo Build start `date`
15+
- echo Build Docker
16+
- echo ${REPOSITORY_URI}
17+
- docker build --build-arg APIKEY=${APIKEY} --build-arg AUTHDOMAIN=${AUTHDOMAIN} --build-arg DATABASEURL=${DATABASEURL} --build-arg PROJECTID=${PROJECTID} --build-arg STORAGEBUCKET=${STORAGEBUCKET} --build-arg MESSAGINGSENDERID=${MESSAGINGSENDERID} --build-arg APPID=${APPID} --build-arg MEASUREMENTID=${MEASUREMENTID} -t ${REPOSITORY_URI}:latest .
18+
- docker tag ${REPOSITORY_URI}:latest ${REPOSITORY_URI}:${IMAGE_TAG}
19+
post_build:
20+
commands:
21+
- echo Build complete `date`
22+
- echo Push Docker
23+
- docker push ${REPOSITORY_URI}:latest
24+
- docker push ${REPOSITORY_URI}:${IMAGE_TAG}
25+
- echo Writing image definitions file...
26+
- echo "[{\"name\":\"${CONTAINER_NAME}\",\"imageUri\":\"${REPOSITORY_URI}:${IMAGE_TAG}\"}]" > imagedefinitions.json
27+
artifacts:
28+
files: imagedefinitions.json

docker-compose.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
version: "3.7"
22
services:
33
studyathome:
4-
build: .
5-
command: yarn install & yarn dev
4+
image: node:12.18.1-alpine
5+
command: /bin/sh -c "yarn install && yarn run dev"
6+
working_dir: /app
67
ports:
7-
- 3000:3000
8+
- 3000:3000
89
volumes:
9-
- .:/app
10+
- .:/app
11+
environment:
12+
- HOST=0.0.0.0
13+
- NODE_ENV=development
1014

functions/.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

functions/.eslintrc.json

Lines changed: 0 additions & 123 deletions
This file was deleted.

functions/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

functions/index.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)