From e79dfb620c73099e469cee01e446306ef439888c Mon Sep 17 00:00:00 2001 From: psyciknz Date: Wed, 7 Jan 2026 10:09:38 +1300 Subject: [PATCH 1/2] Add alarm-local branch to Docker CI workflow --- .github/workflows/docker-image.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..1f51dbb --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,18 @@ +name: Docker Image CI + +on: + push: + branches: [ "master","alarm-local" ] + pull_request: + branches: [ "master" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Build the Docker image + run: docker build . --file Dockerfile --tag my-image-name:$(date +%s) From d449e9267929ba21b806655392369e84dd437610 Mon Sep 17 00:00:00 2001 From: psyciknz Date: Wed, 7 Jan 2026 10:11:50 +1300 Subject: [PATCH 2/2] REmoving travis directories --- .travis.yml | 39 --------------------------------------- .travis/deploy.sh | 28 ---------------------------- 2 files changed, 67 deletions(-) delete mode 100644 .travis.yml delete mode 100755 .travis/deploy.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d89269d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,39 +0,0 @@ - -language: python -#addons: -# apt: -# packages: -# - python3-dev -# - libgnutls28-dev -python: - - "3.7" -before_install: - - sudo apt-get update -q - - sudo apt-get -y install python3-dev - - sudo apt-get -y install libgnutls28-dev - - python -m pip install --upgrade pip - -# command to run tests -install: pip install -r requirements.txt -script: pytest ./Tests/test_onreceive.py -# runs all but needs connection to cameras -#script: pytest -jobs: - include: - - stage: build docker image - python: '3.7' - script: "./.travis/deploy.sh" - if: type != pull_request AND (branch IN (alarm-local, master) OR tag IS present) - addons: - apt: - sources: - - sourceline: deb https://download.docker.com/linux/ubuntu/ xenial stable - key_url: https://download.docker.com/linux/ubuntu/gpg - packages: - - docker-ce - - docker-ce-cli - - containerd.io - - stage: test - script: - - export DOCKER_IMAGE_TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH-latest"; fi` - - docker run --rm "$DOCKER_USERNAME/cameraevents:$DOCKER_IMAGE_TAG" diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index dbb2638..0000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -e - -if [ "$TRAVIS_PULL_REQUEST" == "true" ]; then - echo "We should not deploy pull requests!" - exit 1 -fi - -DOCKER_VERSION_TAG=$(grep -Po '(?<=version = \")[^\"]+' ./CameraEvents.py) -echo "Extracted Version number $DOCKER_VERSION_TAG" - -if [ -z "$TRAVIS_TAG" ]; then - DOCKER_IMAGE_TAG=$(if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo "$TRAVIS_BRANCH-latest"; fi) -else - DOCKER_IMAGE_TAG="$TRAVIS_TAG" -fi - -echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - -export DOCKER_IMAGE_TAG -export DOCKER_VERSION_TAG -export DOCKER_CLI_EXPERIMENTAL=enabled - -docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -docker buildx create --use -#docker buildx build --progress plain --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 -t "psyciknz/cameraevents:$DOCKER_IMAGE_TAG" -t "psyciknz/cameraevents:$DOCKER_VERSION_TAG" --push . -docker buildx build --progress plain --platform linux/amd64 -t "psyciknz/cameraevents:$DOCKER_IMAGE_TAG" -t "psyciknz/cameraevents:$DOCKER_VERSION_TAG" --push .