diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 896cefc..193a4e8 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -16,29 +16,23 @@ jobs: token: ${{ secrets.REGISTRY_TOKEN }} - name: Login to Gitea Container Registry - uses: https://github.com/docker/login-action@v3 - with: - registry: ${{ vars.REGISTRY_HOST }} - username: ${{ secrets.REGISTRY_USER }} - password: ${{ secrets.REGISTRY_TOKEN }} + run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ vars.REGISTRY_HOST }} -u ${{ secrets.REGISTRY_USER }} --password-stdin - name: Build and push backend - uses: https://github.com/docker/build-push-action@v5 - with: - context: ./backend - push: true - tags: | - ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:main-latest - ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:${{ github.sha }} + run: | + docker build -t ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:main-latest \ + -t ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:${{ github.sha }} \ + ./backend + docker push ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:main-latest + docker push ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-backend:${{ github.sha }} - name: Build and push frontend - uses: https://github.com/docker/build-push-action@v5 - with: - context: ./frontend - push: true - tags: | - ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:main-latest - ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:${{ github.sha }} + run: | + docker build -t ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:main-latest \ + -t ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:${{ github.sha }} \ + ./frontend + docker push ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:main-latest + docker push ${{ vars.REGISTRY_HOST }}/rohskiddo/umbra-frontend:${{ github.sha }} - name: Pull new images run: | diff --git a/act_runner_config.yaml b/act_runner_config.yaml index 531c7bb..a0a56a2 100644 --- a/act_runner_config.yaml +++ b/act_runner_config.yaml @@ -1,4 +1,20 @@ +log: + level: info + +runner: + capacity: 1 + timeout: 3h + insecure: false + +cache: + enabled: false + container: network: host privileged: false options: "--security-opt label:disable" + valid_volumes: + - "**" + +host: + workdir_parent: /tmp/act_runner diff --git a/docker-compose.yaml b/docker-compose.yaml index c49581a..a9000bc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -72,8 +72,9 @@ services: volumes: - act_runner_data:/data - /var/run/docker.sock:/var/run/docker.sock - - ./act_runner_config.yaml:/data/config.yaml:ro + - ./act_runner_config.yaml:/etc/act_runner/config.yaml:ro environment: + - CONFIG_FILE=/etc/act_runner/config.yaml - GITEA_INSTANCE_URL=https://git.sentinelforest.xyz - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN} - GITEA_RUNNER_NAME=umbra-runner