Skip to content

Commit

Permalink
[CORL-159, CORL-160] Stream Config Tab (coralproject#2219)
Browse files Browse the repository at this point in the history
* feat: Implement stream configuration tab

* feat: split profile & configure into separate bundles

* chore: better role logic

* fix+chore: add test cases, implement expectAndFail, refactor tests

* chore: add some comments

* chore: Update src/core/client/framework/lib/form/helpers.tsx

Co-Authored-By: cvle <vinh@wikiwi.io>

* feat: support new graphql mutations/schema

* fix: ci fixes

* fix: improvement to revision loading

* fix: updated some tests

* fix: adapt client to changes

* fix: remove obsolote isClosed in UpdateStory

* ci: increase no_output_timeout for build
  • Loading branch information
cvle authored Mar 18, 2019
1 parent c738d9a commit 9eb5afb
Show file tree
Hide file tree
Showing 128 changed files with 2,245 additions and 1,077 deletions.
18 changes: 12 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ jobs:
- run:
name: Build
command: npm run build
no_output_timeout: 20m
- run:
name: Verify Bundle Size
command: npx bundlesize
Expand All @@ -120,14 +121,18 @@ jobs:

# docker_tests will test that the docker build process completes.
docker_tests:
<<: *job_defaults
docker:
- image: node:10-alpine
environment:
NODE_ENV: development
steps:
- checkout
- setup_remote_docker
- run:
name: Build
command: docker build -t coralproject/talk:next --build-arg REVISION_HASH=${CIRCLE_SHA1} .
no_output_timeout: 20m
name: Update Image Dependancies
command: apk --no-cache add git python
- run:
name: Install NodeJS Dependancies
command: npm install

# release_docker will build and push the Docker image.
release_docker:
Expand All @@ -140,7 +145,8 @@ jobs:
command: docker login -u $DOCKER_USER -p $DOCKER_PASS
- run:
name: Build
command: docker build -t coralproject/talk:next --build-arg REVISION_HASH=${CIRCLE_SHA1} .
command: docker build -t coralproject/talk:next --build-arg REVISION_HASH=$CIRCLE_SHA1 .
no_output_timeout: 30m
- run:
name: Push
command: docker push coralproject/talk:next
Expand Down
2 changes: 2 additions & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
10

19 changes: 5 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,21 @@ ENV NODE_ENV production
# Bundle application source.
COPY . /usr/src/app

# Store the current git revision.
ARG REVISION_HASH
RUN mkdir -p dist/core/common/__generated__ && \
echo "{\"revision\": \"${REVISION_HASH}\"}" > dist/core/common/__generated__/revision.json

# Install build static assets and clear caches.
RUN NODE_ENV=development npm install && \
npm run generate && \
npm run build && \
npm prune --production

FROM node:10-alpine

# Create app directory
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

# Copy the compiled source into the new stage.
COPY --from=0 /usr/src/app .

# Setup the environment
ENV PATH /usr/src/app/bin:$PATH
ENV PORT 5000
EXPOSE 5000
ENV NODE_ENV production

# Store the current git revision.
ARG REVISION_HASH
RUN mkdir dist/core/common/__generated__ && \
echo "{\"revision\": \"${REVISION_HASH}\"}" > dist/core/common/__generated__/revision.json

CMD ["npm", "run", "start"]
150 changes: 101 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"express-static-gzip": "^0.3.2",
"farce": "^0.2.6",
"fluent": "^0.10.0",
"found": "^0.3.14",
"found": "^0.3.21",
"found-relay": "^0.3.1",
"fs-extra": "^6.0.1",
"graphql": "^0.13.2",
Expand Down Expand Up @@ -170,7 +170,7 @@
"@types/passport-oauth2": "^1.4.5",
"@types/passport-strategy": "^0.2.33",
"@types/prop-types": "^15.5.8",
"@types/react": "^16.7.20",
"@types/react": "^16.8.7",
"@types/react-copy-to-clipboard": "^4.2.5",
"@types/react-dom": "^16.0.11",
"@types/react-relay": "^1.3.9",
Expand Down Expand Up @@ -263,15 +263,15 @@
"pstree.remy": "^1.1.0",
"pym.js": "^1.3.2",
"raw-loader": "^0.5.1",
"react": "^16.8.0",
"react": "^16.8.4",
"react-copy-to-clipboard": "^5.0.1",
"react-dev-utils": "6.0.0-next.3e165448",
"react-dom": "^16.8.0",
"react-dom": "^16.8.4",
"react-final-form": "^3.6.4",
"react-popper": "^1.3.2",
"react-relay": "^1.7.0-rc.1",
"react-responsive": "^5.0.0",
"react-test-renderer": "^16.8.0",
"react-test-renderer": "^16.8.4",
"react-timeago": "^4.1.9",
"react-transition-group": "^2.5.0",
"react-with-state-props": "^2.0.4",
Expand Down
Loading

0 comments on commit 9eb5afb

Please sign in to comment.