Skip to content

Commit 681ffb4

Browse files
committed
use old dm3-backend image
1 parent 9e31830 commit 681ffb4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/pord-deploy.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ jobs:
5959
run: |
6060
cp ./.env.react packages/messenger-demo/.env
6161
cp ./.env.react packages/messenger-web/.env
62-
docker build --progress=plain -t @dm3-org/dm3-backend:latest -f ./docker/Dockerfile .
63-
docker save -o ./@dm3-org/dm3-backend.tar @dm3-org/dm3-backend:latest
62+
docker build --progress=plain -t dm3-backend:latest -f ./docker/Dockerfile .
63+
docker save -o ./dm3-backend.tar dm3-backend:latest
6464
- name: Sync files
6565
run: |
6666
rsync -avz -e 'ssh -i ./ssh-key' ./.env app@${{ secrets.IP_ADDRESS}}:/home/app/dm3
67-
rsync -avz -e 'ssh -i ./ssh-key' ./@dm3-org/dm3-backend.tar app@${{ secrets.IP_ADDRESS}}:/home/app/dm3
67+
rsync -avz -e 'ssh -i ./ssh-key' ./dm3-backend.tar app@${{ secrets.IP_ADDRESS}}:/home/app/dm3
6868
rsync -avz -e 'ssh -i ./ssh-key' ./nginx.conf app@${{ secrets.IP_ADDRESS}}:/home/app/dm3
6969
rsync -avz -e 'ssh -i ./ssh-key' ./docker/prod/docker-compose.yml app@${{ secrets.IP_ADDRESS}}:/home/app/dm3
7070
- name: Prepare docker
@@ -76,13 +76,13 @@ jobs:
7676
- name: Load docker image
7777
run: |
7878
ssh -i ./ssh-key app@${{ secrets.IP_ADDRESS}} "\
79-
cd dm3 && docker load -i @dm3-org/dm3-backend.tar; \
80-
rm @dm3-org/dm3-backend.tar || true"
79+
cd dm3 && docker load -i dm3-backend.tar; \
80+
rm dm3-backend.tar || true"
8181
- name: Firewall config
8282
run: |
8383
ssh -i ./ssh-key root@${{ secrets.IP_ADDRESS}} "\
8484
ufw allow from 172.18.0.1/16 proto tcp to ${{ secrets.IP_ADDRESS }} port 80"
8585
- name: Start
8686
run: |
8787
ssh -i ./ssh-key app@${{ secrets.IP_ADDRESS}} "\
88-
cd dm3 && docker compose --env-file .env up -d"
88+
cd dm3 && docker compose --env-file .env up -d"

.github/workflows/staging-deploy.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -58,30 +58,30 @@ jobs:
5858
- name: Build docker image
5959
run: |
6060
cp ./.env.react packages/messenger-demo/.env
61-
docker build --progress=plain -t @dm3-org/dm3-backend:latest -f ./docker/Dockerfile .
62-
docker save -o ./@dm3-org/dm3-backend.tar @dm3-org/dm3-backend:latest
61+
docker build --progress=plain -t dm3-backend:latest -f ./docker/Dockerfile .
62+
docker save -o ./dm3-backend.tar dm3-backend:latest
6363
- name: Prepare docker
6464
run: |
6565
ssh -i ./ssh-key app@${{ secrets.HOST_DOMAIN}} "\
6666
cd dm3 && docker compose down && docker system prune -af"
6767
ssh -i ./ssh-key root@${{ secrets.HOST_DOMAIN}} "\
6868
systemctl restart docker.service \
69-
rm /home/app/@dm3-org/dm3-backend.tar || true"
69+
rm /home/app/dm3-backend.tar || true"
7070
- name: Sync files
7171
run: |
7272
rsync -avz -e 'ssh -i ./ssh-key' ./.env app@${{ secrets.HOST_DOMAIN}}:/home/app/dm3
73-
rsync -avz -e 'ssh -i ./ssh-key' ./@dm3-org/dm3-backend.tar app@${{ secrets.HOST_DOMAIN}}:/home/app/dm3
73+
rsync -avz -e 'ssh -i ./ssh-key' ./dm3-backend.tar app@${{ secrets.HOST_DOMAIN}}:/home/app/dm3
7474
rsync -avz -e 'ssh -i ./ssh-key' ./nginx.conf app@${{ secrets.HOST_DOMAIN}}:/home/app/dm3
7575
rsync -avz -e 'ssh -i ./ssh-key' ./docker/docker-compose.yml app@${{ secrets.HOST_DOMAIN}}:/home/app/dm3
7676
- name: Load docker image
7777
run: |
7878
ssh -i ./ssh-key app@${{ secrets.HOST_DOMAIN}} "\
79-
cd dm3 && docker load -i @dm3-org/dm3-backend.tar"
79+
cd dm3 && docker load -i dm3-backend.tar"
8080
- name: Firewall config
8181
run: |
8282
ssh -i ./ssh-key root@${{ secrets.HOST_DOMAIN}} "\
8383
ufw allow from 172.18.0.1/16 proto tcp to ${{ secrets.HOST_DOMAIN}} port 80"
8484
- name: Start
8585
run: |
8686
ssh -i ./ssh-key app@${{ secrets.HOST_DOMAIN}} "\
87-
cd dm3 && docker compose --env-file .env up -d"
87+
cd dm3 && docker compose --env-file .env up -d"

0 commit comments

Comments
 (0)