Skip to content

Commit

Permalink
Upcoming/v1.0.0 (#110)
Browse files Browse the repository at this point in the history
Version 1.0.0!
  • Loading branch information
chrivers authored May 24, 2023
2 parents 896b28e + 38fe04b commit a5655af
Show file tree
Hide file tree
Showing 70 changed files with 3,591 additions and 442 deletions.
6 changes: 6 additions & 0 deletions .docker-os-detect
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

if uname -r | grep -cq microsoft-; then
echo "WINDOWS DETECTED. Docker-on-windows is not compatible with ankerctl." > /dev/stderr
exit 1
fi
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
*.md text
*.txt text
*.tpl text
*.py text diff=python
*.py text diff=python eol=lf
11 changes: 11 additions & 0 deletions .hintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": ["development"],
"hints": {
"axe/aria": [
"default",
{
"aria-valid-attr-value": "off"
}
]
}
}
1 change: 1 addition & 0 deletions .pep8
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
max_line_length = 120
ignore = E221,E226,E231,E241,E261,E203,E741
exclude = libflagship/pppp.py,libflagship/mqtt.py,libflagship/amtypes.py
statistics = True
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"tabWidth": 4,
"useTabs": false,
"printWidth": 120,
"singleQuote": false,
"jsxSingleQuote": true,
"quoteProps": "as-needed"
}
11 changes: 10 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
{
"files.insertFinalNewline": true
"files.insertFinalNewline": true,
"[python]": {
"editor.defaultFormatter": "ms-python.autopep8",
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "modifications"
},
"python.linting.pycodestyleEnabled": true,
"python.linting.pycodestyleArgs": ["--config", ".pep8"],
"python.formatting.autopep8Args": ["--config", ".pep8"],
"python.formatting.provider": "autopep8"
}
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.0.0] - 2023-05-24

- Version 1.0.0!
- Add video streaming support to web ui
- Add support for uploading `login.json` through web ui
- Add print monitoring through web ui
- Add new mqtt types to libflagship
- Add status icons for mqtt, pppp and ctrl websocket
- Add support for restarting web services through web ui
- Add support for turning on/off camera light from web ui
- Add support for controlling video mode (sd/hd) from web ui
- Add `--pppp-dump` option for making a debug packet capture
- Stabilized video streaming, by fixing some rare corner cases.
- Make video stream automatically reconnect on connection loss
- Make video stream automatically suspend when no clients are connected

## [0.9.0] - 2023-04-17

- First version with github actions for building docker image. (thanks to @cisien)
Expand Down
18 changes: 14 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
# First stage: build environment
FROM python:3.11-bullseye AS build-env

# Set the working directory to /app
WORKDIR /app
COPY .docker-os-detect /tmp/docker-os-detect
RUN sh /tmp/docker-os-detect

# Copy the requirements file
COPY requirements.txt .

# Disable warning about running as "root"
ENV PIP_ROOT_USER_ACTION=ignore

# Disable caching - we just want the output
ENV PIP_NO_CACHE_DIR=1

# Install the dependencies
RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r requirements.txt
RUN pip install --upgrade pip && \
pip install -r requirements.txt

# Second stage: runtime environment
FROM python:3.11-slim
Expand All @@ -21,12 +27,16 @@ RUN mkdir -p /root/.config/

# Copy the script and libraries
COPY ankerctl.py /app/
COPY web /app/web/
COPY ssl /app/ssl/
COPY static /app/static/
COPY libflagship /app/libflagship/
COPY cli /app/cli/

# Copy the installed dependencies from the build environment
COPY --from=build-env /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages

STOPSIGNAL SIGINT

ENTRYPOINT ["/app/ankerctl.py"]
CMD ["webserver", "run"]
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
update:
@transwarp -D specification -I templates/python/ -L templates/lib -O libflagship -u
@transwarp -D specification -I templates/js/ -L templates/lib -O static -u

diff:
@transwarp -D specification -I templates/python/ -L templates/lib -O libflagship -d
@transwarp -D specification -I templates/js/ -L templates/lib -O static -d

install-tools:
git submodule update --init
pip install ./transwarp

clean:
@find -name '*~' -o -name '__pycache__' -print0 | xargs -0 rm -rfv
Loading

0 comments on commit a5655af

Please sign in to comment.