Merge branch 'master' of https://github.com/markusressel/barcode-forw…

…arder

.github/workflows/pythonpackage.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ 3.8, 3.9 ]
+        python-version: [ "3.10" ]
 
     steps:
       - uses: actions/checkout@v1

Dockerfile

@@ -1,16 +1,19 @@
 # Docker image for barcode-server
 
-FROM python:3.10
+# dont use alpine for python builds: https://pythonspeed.com/articles/alpine-docker-python/
+FROM python:3.10-slim-buster
 
 WORKDIR /app
 
 COPY . .
 
 RUN apt-get update \
- && apt-get -y install sudo
+    && apt-get -y install sudo python3-pip python3-evdev \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
 RUN pip install --upgrade pip;\
+    pip3 install evdev;\
     pip install pipenv;\
-    pipenv install --system --deploy;\
+    PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy;\
     pip install .
 
 ENV PUID=1000 PGID=1000

Makefile

@@ -1,5 +1,8 @@
 PROJECT=barcode_server
 
+docker-image:
+	docker build . --file Dockerfile --tag markusressel/barcode-server:latest --no-cache
+
 current-version:
 	set -ex
 	@echo "Current version is `cat ${PROJECT}/__init__.py | grep '__version__' | cut -d ' ' -f3 | sed s/\\\"//g`"

docker-compose.yml

@@ -0,0 +1,22 @@
+version: '3.8'
+
+services:
+  barcode-server:
+    # build: .
+    image: markusressel/barcode-server:latest
+    environment:
+      - PUID=0
+      - PGID=0
+    devices:
+      - "/dev/input"
+    volumes:
+      # mount a YAML configuration file into /app/barcode_server.yaml:
+      - "./barcode_server.yaml:/app/barcode_server.yaml"
+    networks:
+      - docker-elk
+    ports:
+      - "8000:8000"
+    restart: on-failure
+networks:
+  docker-elk:
+    driver: bridge

tests/barcode_server.yaml

@@ -4,6 +4,6 @@ barcode_server:
     port: 9654
     api_token: "EmUSqjXGfnQwn5wn6CpzJRZgoazMTRbMNgH7CXwkQG7Ph7stex"
   devices:
-    - "Barcode/i"
+    - "Barcode"
   stats:
     port:

tests/websocket_notifier_test.py

@@ -3,7 +3,7 @@
 from unittest.mock import MagicMock
 
 import aiohttp
-from aiohttp.test_utils import AioHTTPTestCase, unittest_run_loop
+from aiohttp.test_utils import AioHTTPTestCase
 
 from barcode_server import const
 from barcode_server.barcode import BarcodeEvent
@@ -58,10 +58,6 @@ async def get_application(self):
         await site.start()
         return app
 
-    # the unittest_run_loop decorator can be used in tandem with
-    # the AioHTTPTestCase to simplify running
-    # tests that are asynchronous
-    @unittest_run_loop
     async def test_ws_connect_and_event(self):
         sample_event = create_barcode_event_mock("abcdefg")
         server_id = self.config.INSTANCE_ID.value
@@ -88,7 +84,6 @@ async def test_ws_connect_and_event(self):
 
         assert False
 
-    @unittest_run_loop
     async def test_ws_reconnect_event_catchup(self):
         server_id = self.config.INSTANCE_ID.value
         missed_event = create_barcode_event_mock("abcdefg")
@@ -144,7 +139,6 @@ async def test_ws_reconnect_event_catchup(self):
 
         assert False
 
-    @unittest_run_loop
     async def test_ws_reconnect_drop_queue(self):
         server_id = self.config.INSTANCE_ID.value
         missed_event = create_barcode_event_mock("abcdefg")