Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
Visoff committed Aug 13, 2023
1 parent 88e6aab commit 084780e
Show file tree
Hide file tree
Showing 8 changed files with 404 additions and 370 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
- name: deploy
uses: appleboy/ssh-action@v1.0.0
with:
host: 82.147.71.182
username: ilya
password: 17022006a1
host: ${{ secrets.HOST }}
username: ${{ secrets.USER }}
password: ${{ secrets.PASSWORD }}
script: |
cd /home/ilya/messenger
git pull github main
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@ services:
- 443:443
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
depends_on:
- goserver

client:
build: ./svelte_client/
ports:
- 5173:5173
depends_on:
- goserver
4 changes: 4 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ http {
server {
listen 80;

location / {
proxy_pass http://client:5173/api/;
}

location /server/ {
proxy_pass http://goserver:8080/api/;
}
Expand Down
10 changes: 10 additions & 0 deletions svelte_client/.Dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.DS_Store
node_modules
/build
/.svelte-kit
/package
.env
.env.*
!.env.example
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
15 changes: 15 additions & 0 deletions svelte_client/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM node:16

WORKDIR /app/

COPY ./package*.json .

RUN npm i

COPY . .

# RUN npm run build

EXPOSE 5173

CMD [ "npm", "run", "dev" ]

0 comments on commit 084780e

Please sign in to comment.