Skip to content

Commit

Permalink
Сети фронта и бэка объединены в одну
Browse files Browse the repository at this point in the history
  • Loading branch information
DeDxYk594 committed Dec 10, 2024
1 parent f136e2f commit 8c77d8c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ RUN npm run build
FROM nginx:stable-alpine
RUN rm /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d
COPY ./keys/ /usr/share/keys
RUN nginx -t
COPY sw.js /usr/share/nginx/html/
COPY --from=builder /app/dist /usr/share/nginx/html
Expand Down
9 changes: 7 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ services:
build:
context: .
dockerfile: ./Dockerfile
network_mode:
host
networks:
- Pumpkin-network
volumes:
- pumpkin-user-uploads:/usr/share/nginx/html/uploads
volumes:
pumpkin-user-uploads:

networks:
Pumpkin-network:
external:
name: Pumpkin-network
2 changes: 1 addition & 1 deletion nginx.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server {
listen 8880 ssl;
listen 8880;

root /usr/share/nginx/html;
index index.html;
Expand Down

0 comments on commit 8c77d8c

Please sign in to comment.