Skip to content

Commit

Permalink
Containerize semonitor
Browse files Browse the repository at this point in the history
To be able to track dependencies better, make development easier and
have a more reliable means of distributing and managing semonitor, it is
good to put it isolate it within a container.

Everything should still be useable as before, but care needs to be taken
when running pipelines, as if these are not properly passed into the
container, one is piping the outside of the container. The result would
be the same, but either two docker instances would need to be run or the
second command needs to be available on the host. Both are not ideal
solutions.

Signed-off-by: Olliver Schinagl <[email protected]>
  • Loading branch information
oliv3r committed Jun 20, 2023
1 parent 8e3d034 commit 2209715
Show file tree
Hide file tree
Showing 7 changed files with 251 additions and 16 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.circleci/
.git/
test/
79 changes: 79 additions & 0 deletions .github/workflows/container-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Create and publish Container image

on:
push:
branches:
- master
tags:
- 'v*'
pull_request:
branches:
- master

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
TEST_TAG: ${{ github.repository }}:test_tag

jobs:
build-and-push-image:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout repository
uses: actions/checkout@v3
lfs: true

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Container registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
images: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=ref,event=pr
type=edge
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
flavor: |
latest=auto
- name: Build and export
uses: docker/build-push-action@v4
with:
context: .
file: Containerfile
load: true
tags: ${{ env.TEST_TAG }}

- name: Test
run: |
docker container run --rm --volume "$(pwd)/test:/usr/local/src/solaredge/test" ${{ env.TEST_TAG }} '/bin/sh' -c 'apk add --no-cache bash && ./test/test.sh'
- name: Build and push
uses: docker/build-push-action@v4
with:
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6
context: .
file: Containerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
16 changes: 0 additions & 16 deletions .github/workflows/test.yml

This file was deleted.

36 changes: 36 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
#
# Copyright (C) 2023 Olliver Schinagl <[email protected]>

ARG PYTHON_VERSION="3-alpine"

FROM index.docker.io/library/python:${PYTHON_VERSION}


COPY requirements.txt /tmp/

RUN apk add --no-cache --virtual .build-deps \
gcc \
musl-dev \
linux-headers \
&& \
pip --no-cache-dir install --requirement '/tmp/requirements.txt' && \
rm '/tmp/requirements.txt' && \
apk del .build-deps && \
addgroup -S 'semonitor' && \
adduser -D -G 'semonitor' -h '/var/lib/semonitor' -s '/bin/nologin' -S 'semonitor' && \
adduser 'semonitor' 'usb' && \
install -d -m 775 -g 'semonitor' -o 'semonitor' '/var/lib/semonitor'

VOLUME /var/lib/semonitor

WORKDIR /usr/local/src/solaredge/

COPY conversion /usr/local/src/solaredge/conversion
COPY scripts/semonitor.sh /usr/local/bin/semonitor.sh
COPY se /usr/local/src/solaredge/se
COPY semonitor.py /usr/local/src/solaredge/semonitor.py
COPY services/container-entrypoint.sh /init
COPY utilities /usr/local/src/solaredge/utilities

ENTRYPOINT [ "/init" ]
96 changes: 96 additions & 0 deletions README.Docker.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# Running semonitor in docker
TVHeadend can be run within a Docker container. This provides isolation from
other processes by running it in a containerized environment. As this is not
and in-depth tutorial on docker, those with Docker, containers or cgroups see
[docker.com][docker].

This guide is not a comprehensive guide, but just lists the most basic things!


## Building the container
Building the container is only needed if the official one is not sufficient,
or when developing on semonitor.

To build the image, the following can be used, where `ISSUE-123` is just used
as an example. It is important in that it will be re-used later.

```sh
docker image build \
--file 'Containerfile' \
--rm \
--tag 'semonitor:ISSUE-123' \
'./'
```


## Running tests
The tests are not included in the container image, so we volume mount them to
make them available to the installed semonitor application.

```sh
docker container run \
--interactive \
--rm \
--tty \
--volume "$(pwd)/test:/usr/local/src/solaredge/test" \
'semonitor:ISSUE-123' \
'/bin/sh' -c 'apk add --no-cache bash && ./test/test.sh'
```


## Running serial device
Running the semonitor on a serial device using the official latest image can
be done as follows.

```sh
docker container run \
--device '/dev/ttyUSB0:/dev/solaredge' \
--interactive \
--rm \
--tty \
--volume "$(pwd)/semonitor_logs/:/semonitor/" \
'ghcr.io/jbuel/solaredge:latest' \
semonitor.sh \
-a \
-b 115200 \
-m \
-o "/semonitor/json/$(date +%Y%m%d).json" \
-r "/semonitor/rec/$(date +%Y%m%d).rec" \
-s '1234567' \
-t 4 \
'/dev/solaredge'
```

## Using compose
It is also possible to run the container using `docker compose`. Here an
example. The device used is a udev symlinked serial to USB adapter, whith
the appropriate permissions.

```yaml
networks:
semonitor: {}

volumes:
semonitor:

services:
sslh:
image: ghcr.io/jbhuel/solaredge:master
cap_drop:
- all
ulimits:
nproc: 64
nofile:
soft: 4194304
hard: 16777216
devices:
- /dev/solaredge
env_file:
- common.env
volumes:
- semonitor:/var/lib/semonitor:rw
networks:
- semonitor
command: -a -b 115200 -m -o "/var/lib/semonitor/json/$(date +%Y%m%d).json" -r "/var/lib/semonitor/rec/$(date +%Y%m%d).rec" -s '1234567' -t 4 '/dev/solaredge'
restart: unless-stopped
```
13 changes: 13 additions & 0 deletions scripts/semonitor.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
# SPDX-License-Identifier: AGPL-3.0-or-later

set -eu
if [ -n "${DEBUG_TRACE_SH:-}" ] && \
[ "${DEBUG_TRACE_SH:-}" != "${DEBUG_TRACE_SH#*"$(basename "${0}")"*}" ] || \
[ "${DEBUG_TRACE_SH:-}" = 'all' ]; then
set -x
fi

exec '/usr/local/src/solaredge/semonitor.py' "${@}"

exit 0
24 changes: 24 additions & 0 deletions services/container-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0-or-later
#
# Copyright (C) 2023 Olliver Schinagl <[email protected]>
#
# A beginning user should be able to docker run image bash (or sh) without
# needing to learn about --entrypoint
# https://github.com/docker-library/official-images#consistency

set -eu

bin='semonitor.sh'

# run command if it is not starting with a "-" and is an executable in PATH
if [ "${#}" -le 0 ] || \
[ "${1#-}" != "${1}" ] || \
[ -d "${1}" ] || \
! command -v "${1}" > '/dev/null' 2>&1; then
entrypoint='true'
fi

exec ${entrypoint:+${bin:?}} "${@}"

exit 0

0 comments on commit 2209715

Please sign in to comment.