Skip to content
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
!tsconfig.json
!tsconfig.build.json
!jest.config.ts
!jest.setup.ts
!common/
!websocket/
!packages/
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ COPY ./package*.json ./

USER root

RUN npm install -g npm && \
# RUN --mount=type=cache,target=/app/node_modules \
# --mount=type=cache,target=/usr/local/lib/node_modules \
RUN \
npm install -g npm && \
npm install -g typescript && \
npm install
# npm install -g @nestjs/cli && \
npm ci

COPY ./tsconfig*.json ./
COPY ./nest-cli.json ./
COPY ./src ./src
# COPY ./packages ./packages
COPY ./test ./test
COPY ./jest.setup.ts ./

RUN npm run build

Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ tasks:
desc: "Build docker image if necessary"
sources:
- ./Dockerfile
- ./package*.json
- ./package-lock.json
run: when_changed
cmds:
- docker-compose build
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- HOST=localhost
- LOG_LEVEL=debug
- KAFKA_BROKERS=kafka-jbx:9092
- BASE_URL=http://localhost:8082
- BASE_URL=${BASE_URL:-http://localhost:8082}
- SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID}
- SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET}
- CLUBS_URL=http://clubs-network-proxy:8080
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ services:
volumes:
- ./src:/app/src
- ./package.json:/app/package.json
- ./jest.setup.ts:/app/jest.setup.ts
command: npm run start:dev
user: root

postgres:
image: postgres:13-alpine
Expand Down
1 change: 1 addition & 0 deletions jest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// TODO: Put global db ops in this file
Loading