Browse Source

removed ssl key

master
narnaud 2 years ago
parent
commit
b4e534ae71
  1. 2
      .gitignore
  2. 10
      Makefile
  3. 2
      cont/back/Dockerfile
  4. 6
      cont/front/Dockerfile
  5. 2
      docker-compose.yml
  6. 4
      volumes/front/vite.config.ts

2
.gitignore

@ -1 +1 @@
volumes/ssl/transcendence.pem Makefile.linux

10
Makefile

@ -13,18 +13,18 @@ $(CERT):
mv $(NAME).pem volumes/ssl mv $(NAME).pem volumes/ssl
start: $(CERT) start: $(CERT)
sudo docker compose -f docker-compose.yml up --build BACK_RUN=start docker compose -f docker-compose.yml up --build
debug: $(CERT) debug: $(CERT)
sudo BUILDKIT_PROGRESS=plain docker compose -f docker-compose.yml up --build BUILDKIT_PROGRESS=plain BACK_RUN=start:debug docker compose -f docker-compose.yml up --build
stop: stop:
sudo docker compose -f docker-compose.yml down docker compose -f docker-compose.yml down
clean: stop clean: stop
sudo docker system prune -f docker system prune -f
fclean: stop fclean: stop
sudo docker system prune -af --volumes docker system prune -af --volumes
re: fclean start re: fclean start

2
cont/back/Dockerfile

@ -4,5 +4,5 @@ RUN apk update && apk upgrade && apk add npm \
&& npm install -g @nestjs/cli && npm install -g @nestjs/cli
WORKDIR /var/www/html WORKDIR /var/www/html
ENTRYPOINT npm install && npm run build && npm run start ENTRYPOINT npm install && npm run build && npm run $RUN

6
cont/front/Dockerfile

@ -1,8 +1,6 @@
FROM alpine:3.15 FROM alpine:3.15
RUN apk update && apk upgrade && apk add npm RUN apk update && apk upgrade && apk add npm
RUN mkdir -p /var/ssl
WORKDIR /var/www/html WORKDIR /var/www/html
ENTRYPOINT npm install && npm run build && npm run dev
ENTRYPOINT npm install && npm run dev

2
docker-compose.yml

@ -17,6 +17,8 @@ services:
container_name: back container_name: back
build: cont/back/ build: cont/back/
env_file: .env env_file: .env
environment:
- RUN=${BACK_RUN}
depends_on: [postgres] depends_on: [postgres]
ports: [3001:3001] ports: [3001:3001]
networks: [transcendence] networks: [transcendence]

4
volumes/front/vite.config.ts

@ -5,6 +5,6 @@ import { svelte } from '@sveltejs/vite-plugin-svelte'
export default defineConfig({ export default defineConfig({
plugins: [svelte()], plugins: [svelte()],
server: { server: {
port: 80, port: 80
}, }
}) })

Loading…
Cancel
Save