Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nix dockered #27

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Nix dockered #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9bcc9c
fix the compilation on linux
Kampouse Dec 23, 2022
2904814
fixed docker for linux
Kampouse Dec 23, 2022
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: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ build: docker-compose.yml
@g++ ./tools/envp-parsing/create_env.cpp ./tools/envp-parsing/main.cpp ./tools/envp-parsing/validate_env.cpp ./tools/envp-parsing/header.hpp
@mv a.out ./tools/env_manager
@./tools/env_manager
@python3 ./tools/api_validation.py
@docker-compose -f docker-compose.yml build

down:
Expand Down
13 changes: 6 additions & 7 deletions srcs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
FROM node:latest

FROM nixos/nix AS builder
VOLUME [ "/app" ]

WORKDIR /app

ENV PATH /usr/local/bin:$PATH
ENV PATH="./node_modules/.bin$PATH"

EXPOSE 5173
EXPOSE 5555
EXPOSE 3000
RUN nix-env -iA nixpkgs.nodejs-18_x nixpkgs.nodePackages.pnpm nixpkgs.concurrently nixpkgs.node2nix nixpkgs.vite nixpkgs.gnused
EXPOSE 5173
EXPOSE 3000
CMD [ "pnpm", "dev" ]

CMD [ "npm", "start" ]
4 changes: 2 additions & 2 deletions srcs/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"name": "pongy",
"version": "0.0.1",
"description": "",
Expand Down Expand Up @@ -26,6 +26,7 @@
"@nestjs/common": "^9.0.0",
"@nestjs/core": "^9.0.0",
"@nestjs/jwt": "^9.0.0",
"jsonwebtoken": "^9.0.0",
"@nestjs/mapped-types": "*",
"@nestjs/passport": "^9.0.0",
"@nestjs/platform-express": "^9.0.0",
Expand Down Expand Up @@ -99,4 +100,3 @@
"seed": "ts-node prisma/seed.ts"
}
}

Loading