New Deploy action #2

Merged
Marijn merged 2 commits from new_action into main 2023-08-21 23:17:45 +02:00
4 changed files with 22 additions and 7 deletions

View File

@@ -10,7 +10,6 @@ jobs:
container: container:
image: catthehacker/ubuntu:act-latest image: catthehacker/ubuntu:act-latest
env: env:
DOCKER_ORG: gitea
DOCKER_LATEST: nightly DOCKER_LATEST: nightly
steps: steps:
- name: Checkout - name: Checkout
@@ -44,8 +43,9 @@ jobs:
context: . context: .
file: ./Containerfile file: ./Containerfile
platforms: | platforms: |
linux/amd64
linux/arm/v7 linux/arm/v7
push: true push: true
tags: | tags: |
gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
cache-from: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache
cache-to: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache,mode=max

View File

@@ -11,7 +11,6 @@ jobs:
container: container:
image: catthehacker/ubuntu:act-latest image: catthehacker/ubuntu:act-latest
env: env:
DOCKER_ORG: marijn
DOCKER_LATEST: latest DOCKER_LATEST: latest
steps: steps:
- name: Checkout - name: Checkout
@@ -46,9 +45,25 @@ jobs:
context: . context: .
file: ./Containerfile file: ./Containerfile
platforms: | platforms: |
linux/arm64
linux/arm/v7 linux/arm/v7
push: true push: true
tags: | tags: |
gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
cache-from: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache
cache-to: type=registry,ref=gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:buildcache,mode=max
- name: Deploy Image to Sever
id: deploy
env:
DOCKER_COMPOSE: IMAGE_TAG=${{ gitea.ref_name }} docker compose --ansi=never -f=compose.yaml -f=compose.prod.yaml
uses: https://github.com/appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
key: ${{ secrets.KEY }}
port: ${{ secrets.PORT }}
script: |
cd /opt/projectorpi-web
${{ env.DOCKER_COMPOSE }} pull
${{ env.DOCKER_COMPOSE }} up -d

View File

@@ -13,8 +13,8 @@ FROM base as prod
ADD requirements.txt ./ ADD requirements.txt ./
RUN apt-get update && apt-get install -y build-essential \ RUN apt-get update && apt-get install -y build-essential \
&& pip install --upgrade pip \ && pip3 install --no-cache --upgrade pip \
&& pip3 install -r requirements.txt \ && pip3 install --no-cache -r requirements.txt \
&& apt-get remove -y build-essential && apt-get remove -y build-essential
ADD projectorpi_web/* ./ ADD projectorpi_web/* ./

View File

@@ -1,3 +1,3 @@
services: services:
app: app:
image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-nightly} image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-latest}