Merge pull request #43 from frontend-park-mail-ru/develop

release
frontend-park-mail-ru · Nov 8, 2024 · 8f5096a · 8f5096a
2 parents 615ee16 + 67106a2
commit 8f5096a
Show file tree

Hide file tree

Showing 177 changed files with 19,621 additions and 4,066 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,10 @@
 node_modules/
+dist/
 .idea/
 .vscode/
 .DS_Store
 
 *.precompiled.js
+*.min.css
+
+*.mp3
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 ENV_FILE = ./docker/.env
 include $(ENV_FILE)
 
-DOCKER_COMPOSE_PATH = ./docker/docker-compose.yaml
+DOCKER_COMPOSE_PATH = ./docker/docker-compose.$(ENV).yaml
 
 # use `gawk` on mac os
 AWK := awk

diff --git a/docker/.env b/docker/.env
@@ -1,3 +1,7 @@
 SERVICE_NAME=novamusic
-VERSION=v0.3
-PORT=3000
+VERSION=v0.17
+ENV=dev
+
+SSL_PATH=/etc/ssl/nova-music.ru
+PUBLIC_KEY=fullchain.pem
+PRIVATE_KEY=privkey.pem
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,4 +9,4 @@ COPY . .
 
 EXPOSE 3000
 
-CMD [ "npm", "run", "start" ]
+CMD [ "npm", "run", "build" ]
diff --git a/docker/docker-compose.yaml → docker/docker-compose.dev.yaml b/docker/docker-compose.yaml → docker/docker-compose.dev.yaml
@@ -7,5 +7,5 @@ services:
       context: ..
     env_file: .env
     ports:
-      - 80:${PORT}
+      - 3000:3000
     restart: on-failure
diff --git a/docker/docker-compose.prod.yaml b/docker/docker-compose.prod.yaml
@@ -0,0 +1,13 @@
+services:
+  novamusic-frontend:
+    image: daronenko/novamusic-frontend:${VERSION}
+    container_name: novamusic-frontend
+    build:
+      dockerfile: docker/Dockerfile
+      context: ..
+    env_file: .env
+    ports:
+      - 443:3000
+    restart: on-failure
+    volumes:
+      - /etc/ssl/nova-music.ru:/etc/ssl/nova-music.ru