From 9b832ea4527b9d988cc12f42dbd51068f8cc48b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20P=C4=99dzich?= <contact@maciejpedzi.ch>
Date: Sat, 6 Apr 2024 12:02:13 +0200
Subject: [PATCH] Pass action-defined vars via env step property

---
 .gitea/workflows/build-and-deploy.yaml | 7 ++++++-
 rerun-container.sh                     | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/build-and-deploy.yaml b/.gitea/workflows/build-and-deploy.yaml
index dc90c28..e24e17a 100644
--- a/.gitea/workflows/build-and-deploy.yaml
+++ b/.gitea/workflows/build-and-deploy.yaml
@@ -11,4 +11,9 @@ jobs:
       - name: Build Docker image
         run: docker build -t ${{ vars.IMAGE_TAG }} .
       - name: Rerun website's Docker container
-        run: chmod +x ./rerun-container.sh && (./rerun-container.sh ${{ vars.CONTAINER_NAME }} ${{ vars.PORT_PAIR }} ${{ vars.NETWORK_NAME }} ${{ vars.IMAGE_TAG }})
+        env:
+          CONTAINER_NAME: ${{ vars.CONATINER_NAME }}
+          NETWORK_NAME: ${{ vars.NETWORK_NAME }}
+          PORT_PAIR: ${{ vars.PORT_PAIR }}
+          IMAGE_TAG: ${{ vars.IMAGE_TAG }}
+        run: chmod +x ./rerun-container.sh && ./rerun-container.sh
diff --git a/rerun-container.sh b/rerun-container.sh
index a417c78..46659b0 100644
--- a/rerun-container.sh
+++ b/rerun-container.sh
@@ -1,10 +1,5 @@
 #!/usr/bin/sh
 
-CONTAINER_NAME = $1;
-PORT_PAIR = $2;
-NETWORK_NAME = $3;
-IMAGE_TAG = $4;
-
 docker stop $CONTAINER_NAME && \
 docker container rm $(docker ps -aqf "name=$CONTAINER_NAME") && \
 docker run -d -p $PORT_PAIR --netwok $NETWORK_NAME --name $CONTAINER_NAME $IMAGE_TAG