Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 20535317c7 | |||
| 4c94209a45 | |||
|
f97426956a
|
|||
|
fa067061b3
|
|||
|
cfa0055488
|
|||
|
27437c87ac
|
@@ -10,7 +10,6 @@ jobs:
|
||||
container:
|
||||
image: catthehacker/ubuntu:act-latest
|
||||
env:
|
||||
DOCKER_ORG: gitea
|
||||
DOCKER_LATEST: nightly
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -40,12 +39,16 @@ jobs:
|
||||
uses: docker/build-push-action@v4
|
||||
env:
|
||||
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
||||
IMAGE_NAME: gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}
|
||||
with:
|
||||
context: .
|
||||
file: ./Containerfile
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm/v7
|
||||
push: true
|
||||
tags: |
|
||||
gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }}
|
||||
${{ env.IMAGE_NAME }}:${{ env.DOCKER_LATEST }}
|
||||
# cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:${{ env.DOCKER_LATEST }}
|
||||
# cache-to: type:inline
|
||||
# cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
|
||||
# cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
|
||||
|
||||
@@ -11,7 +11,6 @@ jobs:
|
||||
container:
|
||||
image: catthehacker/ubuntu:act-latest
|
||||
env:
|
||||
DOCKER_ORG: marijn
|
||||
DOCKER_LATEST: latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -42,13 +41,32 @@ jobs:
|
||||
uses: docker/build-push-action@v4
|
||||
env:
|
||||
ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
|
||||
IMAGE_NAME: gitea.marijndoeve.nl/marijn/${{ steps.meta.outputs.REPO_NAME }}
|
||||
with:
|
||||
context: .
|
||||
file: ./Containerfile
|
||||
platforms: |
|
||||
linux/arm64
|
||||
linux/arm/v7
|
||||
push: true
|
||||
tags: |
|
||||
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 }}
|
||||
${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.REPO_VERSION }}
|
||||
${{ env.IMAGE_NAME }}:${{ env.DOCKER_LATEST }}
|
||||
# cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:${{ env.DOCKER_LATEST }}
|
||||
# cache-to: type:inline
|
||||
# cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
|
||||
# cache-to: type=registry,ref=${{ env.IMAGE_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
|
||||
|
||||
@@ -13,8 +13,8 @@ FROM base as prod
|
||||
ADD requirements.txt ./
|
||||
|
||||
RUN apt-get update && apt-get install -y build-essential \
|
||||
&& pip install --upgrade pip \
|
||||
&& pip3 install -r requirements.txt \
|
||||
&& pip3 install --no-cache --upgrade pip \
|
||||
&& pip3 install --no-cache -r requirements.txt \
|
||||
&& apt-get remove -y build-essential
|
||||
|
||||
ADD projectorpi_web/* ./
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
services:
|
||||
app:
|
||||
image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-nightly}
|
||||
image: gitea.marijndoeve.nl/marijn/projectorpi-web:${IMAGE_TAG:-latest}
|
||||
|
||||
Reference in New Issue
Block a user