Simplify Dockerfile and add SSH deploy target into GitHub secret

pygame-community · Jul 28, 2024 · 748bdcf · 748bdcf
1 parent 6e9a742
commit 748bdcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/deploy-to-vps.yml b/.github/workflows/deploy-to-vps.yml
@@ -19,11 +19,10 @@ jobs:
           SSH_PRIVATE_KEY: ${{ secrets.VPS_SSH_PRIVATE_KEY }}
           REMOTE_HOST: ${{ secrets.VPS_HOST }}
           REMOTE_USER: ${{ secrets.VPS_USER }}
-          TARGET: "~"
+          TARGET: ${{ secrets.VPS_TARGET }}
           SCRIPT_AFTER: |
-            cp ~/config.py ~/PygameCommunityBot/config.py
-            cp ~/.env ~/PygameCommunityBot/.env
-            cd ~/PygameCommunityBot
+            cp ~/config.py config.py
+            cp ~/.env .env
             docker compose stop
             docker compose rm -f
             sleep 60

diff --git a/Dockerfile b/Dockerfile
@@ -21,8 +21,6 @@ RUN apt-get update \
 
 COPY ./pyproject.toml ./requirements.txt ./
 
-FROM builder-base AS pipinstall
-
 RUN mkdir $VENV_PATH \
     && python -m venv $VENV_PATH \
     && . $VENV_PATH/bin/activate \
@@ -31,7 +29,7 @@ RUN mkdir $VENV_PATH \
 
 FROM python-base AS runtime
 
-COPY --from=pipinstall $VENV_PATH $VENV_PATH
+COPY --from=builder-base $VENV_PATH $VENV_PATH
 
 COPY ./docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh