Skip to content

Commit

Permalink
Merge branch 'master' into questions-page
Browse files Browse the repository at this point in the history
  • Loading branch information
ckcherry23 authored Oct 8, 2023
2 parents fd4b4a1 + 32e61a3 commit 66f9382
Show file tree
Hide file tree
Showing 10 changed files with 1,607 additions and 1,593 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
java-version: ${{ env.JAVA_VER }}

- name: Install dependencies with immutable lockfile
run: yarn install --immutable
run: yarn install --frozen-lockfile

- name: Run linting
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ WORKDIR /app
COPY package.json yarn.lock ./

# Install dependencies using Yarn
RUN yarn install
RUN yarn install --frozen-lockfile
RUN yarn prisma generate
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.admin-service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "admin-service", "dev" ]
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.collaboration-service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "collaboration-service", "dev" ]
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.frontend
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /app/frontend
COPY frontend .

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Start command for the frontend
CMD [ "yarn", "workspace", "frontend", "dev" ]
Expand Down
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.gateway
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "gateway", "dev" ]
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.matching-service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "matching-service", "dev" ]
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.question-service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "question-service", "dev" ]
2 changes: 1 addition & 1 deletion deployment/dockerfiles/Dockerfile.user-service
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ COPY prisma ./prisma/
RUN yarn prisma generate

# Install dependencies using Yarn Workspaces
RUN yarn install --cwd /app
RUN yarn install --frozen-lockfile --cwd /app

# Run service
CMD [ "yarn", "workspace", "user-service", "dev" ]
3,182 changes: 1,598 additions & 1,584 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 66f9382

Please sign in to comment.