Use build in compose

Reviewed-on: #8

.drone.yml

@@ -1,54 +0,0 @@
-kind: pipeline
-type: docker
-name: deploy
-
-steps:
-  - name: Deploy to Portainer
-    image: alpine
-    commands:
-      - apk update
-      - apk add envsubst curl python3
-      - python3 -m ensurepip
-      - pip3 install requests python-dotenv --quiet
-      - python3 deploy/portainer/deploy.py
-        --PORTAINER https://dvportainer.privatedns.org
-        --PORTAINER_API_KEY=ptr_RwxH2Cd+htdD2FoFiG46erT9beyvj9VoF3BrQPtDH3Q=
-        --PORTAINER_EP=CICD-runner
-        --GITEA_API_KEY=f449c74ec7f04e54fe1e481eae43492b34cea406
-        --DEPLOY_REPO_URL=${DRONE_REPO_LINK}
-        --DEPLOY_BRANCH=${DRONE_COMMIT_BRANCH}
-        --DEPLOY_HOST=dvdemo.privatedns.org
-
-trigger:
-  event:
-  - pull_request
-  action:
-  - opened
-  
----
-
-kind: pipeline
-type: docker
-name: undeploy
-
-steps:
-  - name: Undeploy from Portainer
-    image: alpine
-    commands:
-      - apk update
-      - apk add envsubst curl python3
-      - python3 -m ensurepip
-      - pip3 install requests python-dotenv --quiet
-      - python3 deploy/portainer/undeploy.py
-        --PORTAINER https://dvportainer.privatedns.org
-        --PORTAINER_API_KEY=ptr_RwxH2Cd+htdD2FoFiG46erT9beyvj9VoF3BrQPtDH3Q=
-        --PORTAINER_EP=CICD-runner
-        --GITEA_API_KEY=f449c74ec7f04e54fe1e481eae43492b34cea406
-        --DEPLOY_REPO_URL=${DRONE_REPO_LINK}
-        --DEPLOY_BRANCH=${DRONE_COMMIT_BRANCH}
-
-trigger:
-  event:
-  - pull_request
-  action:
-  - closed, merged

.env

@@ -1,2 +1,2 @@
-HOST=dvdemo.localhost
+HOST=dvdemo1.localhost
 ECHO_PATH=echo

.gitea/workflows/DeployPR.yaml

@@ -0,0 +1,27 @@
+name: Deploy PR
+run-name: ${{ gitea.actor }} is deploying a PR
+on:
+  pull_request:
+    types: [ opened, reopened ]
+
+jobs:
+  Deploy PR:
+    runs-on: ubuntu-latest
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.12.0'
+      - name: Install pip packages
+        run: pip install requests python-dotenv --quiet
+      - name: Run Deploy script
+        run: >
+          python deploy/portainer/deploy.py
+          --PORTAINER https://dvportainer.privatedns.org
+          --PORTAINER_API_KEY=ptr_RwxH2Cd+htdD2FoFiG46erT9beyvj9VoF3BrQPtDH3Q=
+          --PORTAINER_EP=CICD-runner
+          --GITEA_API_KEY=f449c74ec7f04e54fe1e481eae43492b34cea406
+          --DEPLOY_REPO_URL=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+          --DEPLOY_BRANCH=${GITHUB_HEAD_REF}
+          --DEPLOY_HOST=dvdemo.privatedns.org

.gitea/workflows/UndeployPR.yaml

@@ -0,0 +1,27 @@
+name: Undeploy PR
+run-name: ${{ gitea.actor }} is undeploying a PR
+on:
+  pull_request:
+    types: [ closed ]
+
+jobs:
+  Deploy PR:
+    runs-on: ubuntu-latest
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.12.0'
+      - name: Install pip packages
+        run: pip install requests python-dotenv --quiet
+      - name: Run Undeploy script
+        run: >
+          python deploy/portainer/undeploy.py
+          --PORTAINER https://dvportainer.privatedns.org
+          --PORTAINER_API_KEY=ptr_RwxH2Cd+htdD2FoFiG46erT9beyvj9VoF3BrQPtDH3Q=
+          --PORTAINER_EP=CICD-runner
+          --GITEA_API_KEY=f449c74ec7f04e54fe1e481eae43492b34cea406
+          --DEPLOY_REPO_URL=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
+          --DEPLOY_BRANCH=${GITHUB_HEAD_REF}  
+        

docker-compose.yml

@@ -1,10 +1,12 @@
-version: '3.4'
-
-services:  
-  http-echo:
-    image: mendhak/http-https-echo:latest
-    expose:
-      - 8080
-    environment:
-      - VIRTUAL_PORT=8080
+version: '3.4'
+
+services:  
+  http-echo:
+    build:
+      content: ./
+      dockerfile: httpecho.Dockerfile
+    expose:
+      - 8080
+    environment:
+      - VIRTUAL_PORT=8080
       - VIRTUAL_HOST=${HOST}

httpecho.Dockerfile

@@ -0,0 +1,2 @@
+FROM mendhak/http-https-echo:latest
+RUN echo "Hello"