Skip to content

Commit

Permalink
test: set up PR Screenly#1980 for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
nicomiguelino committed Jul 20, 2024
1 parent d58bf00 commit 5461567
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bin/deploy_to_balena.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if [[ -z "${FLEET+x}" ]]; then
exit 1
fi

export GIT_SHORT_HASH=${GIT_SHORT_HASH:-latest}
export GIT_SHORT_HASH='d58bf00'
export DEFAULT_SHM_SIZE='256mb'

if [[ -z "${SHM_SIZE+x}" ]]; then
Expand Down
3 changes: 3 additions & 0 deletions bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@ fi
sudo ${SUDO_ARGS[@]} pip install cryptography==38.0.2
sudo ${SUDO_ARGS[@]} pip install "$ANSIBLE_VERSION"

export REPOSITORY='https://github.com/nicomiguelino/Anthias.git'
export BRANCH='test-fix-1753'

sudo -u ${USER} ${SUDO_ARGS[@]} ansible localhost \
-m git \
-a "repo=$REPOSITORY dest=/home/${USER}/screenly version=$BRANCH force=no"
Expand Down
2 changes: 1 addition & 1 deletion bin/upgrade_containers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export VIEWER_MEMORY_LIMIT_KB=$(echo "$TOTAL_MEMORY_KB" \* 0.8 | bc)
export SHM_SIZE_KB="$(echo "$TOTAL_MEMORY_KB" \* 0.3 | bc | cut -d'.' -f1)"

# Hard code this to latest for now.
export DOCKER_TAG="latest"
export DOCKER_TAG="d58bf00"

# Detect Raspberry Pi version
if grep -qF "Raspberry Pi 4" /proc/device-tree/model; then
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.balena.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: "2"
services:
anthias-wifi-connect:
image: screenly/anthias-wifi-connect:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-wifi-connect:${GIT_SHORT_HASH}-${BOARD}
depends_on:
- anthias-viewer
environment:
Expand All @@ -18,7 +18,7 @@ services:
io.balena.features.firmware: "1"

anthias-server:
image: screenly/anthias-server:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-server:${GIT_SHORT_HASH}-${BOARD}
environment:
- HOME=/data
- LISTEN=0.0.0.0
Expand All @@ -33,7 +33,7 @@ services:
io.balena.features.supervisor-api: '1'

anthias-viewer:
image: screenly/anthias-viewer:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-viewer:${GIT_SHORT_HASH}-${BOARD}
depends_on:
- anthias-server
environment:
Expand All @@ -52,7 +52,7 @@ services:
io.balena.features.supervisor-api: '1'

anthias-websocket:
image: screenly/anthias-websocket:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-websocket:${GIT_SHORT_HASH}-${BOARD}
depends_on:
- anthias-server
environment:
Expand All @@ -63,7 +63,7 @@ services:
- resin-data:/data

anthias-celery:
image: screenly/anthias-celery:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-celery:${GIT_SHORT_HASH}-${BOARD}
depends_on:
- anthias-server
- redis
Expand All @@ -80,15 +80,15 @@ services:
io.balena.features.supervisor-api: '1'

redis:
image: screenly/anthias-redis:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-redis:${GIT_SHORT_HASH}-${BOARD}
ports:
- 127.0.0.1:6379:6379
restart: always
volumes:
- redis-data:/var/lib/redis

anthias-nginx:
image: screenly/anthias-nginx:${GIT_SHORT_HASH}-${BOARD}
image: nicomiguelino/anthias-nginx:${GIT_SHORT_HASH}-${BOARD}
ports:
- 80:80
environment:
Expand Down
14 changes: 7 additions & 7 deletions docker-compose.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
version: "2"
services:
anthias-wifi-connect:
image: screenly/anthias-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-wifi-connect:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.wifi-connect
Expand All @@ -22,7 +22,7 @@ services:
target: /run/dbus/system_bus_socket

anthias-server:
image: screenly/anthias-server:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-server:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.server
Expand All @@ -47,7 +47,7 @@ services:
io.balena.features.supervisor-api: '1'

anthias-viewer:
image: screenly/anthias-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-viewer:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.viewer
Expand All @@ -74,7 +74,7 @@ services:
io.balena.features.supervisor-api: '1'

anthias-websocket:
image: screenly/anthias-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-websocket:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.websocket
Expand All @@ -92,7 +92,7 @@ services:
- /etc/localtime:/etc/localtime:ro

anthias-celery:
image: screenly/anthias-celery:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-celery:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.celery
Expand All @@ -116,7 +116,7 @@ services:
io.balena.features.supervisor-api: '1'

redis:
image: screenly/anthias-redis:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-redis:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.redis
Expand All @@ -127,7 +127,7 @@ services:
- redis-data:/var/lib/redis

anthias-nginx:
image: screenly/anthias-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
image: nicomiguelino/anthias-nginx:${DOCKER_TAG}-${DEVICE_TYPE}
build:
context: .
dockerfile: docker/Dockerfile.nginx
Expand Down

0 comments on commit 5461567

Please sign in to comment.