Merge pull request #48 from StardustSystems/merge-0.17

Merge OSS 0.17 into enterprise

Dockerfile

@@ -1,29 +1,25 @@
 ARG version
 
-FROM suzieq-ent-base:$version AS compiler
+FROM suzieq-base:$version
 
 ARG version
+ARG username=suzieq
+ARG user_id=1000
 
-RUN mkdir -p /suzieq/
-WORKDIR /suzieq
-
+RUN useradd $username -u $user_id --create-home --user-group
 
 COPY ./dist/suzieq-$version-py3-none-any.whl  /tmp/
-RUN pip install /tmp//suzieq-$version-py3-none-any.whl
-COPY suzieq/config/etc/suzieq-cfg.yml /root/.suzieq/suzieq-cfg.yml
-RUN sed -i 's/127.0.0.1/0.0.0.0/' /root/.suzieq/suzieq-cfg.yml
-
-# Certificates and such for REST server
-#COPY logo-small.jpg /suzieq
-
-# Copy parquet files for demo
-# COPY ./parquet /suzieq/parquet
-
-WORKDIR /suzieq
 
+RUN pip install --upgrade pip
+RUN pip install /tmp/suzieq-$version-py3-none-any.whl
+RUN rm /tmp/suzieq-$version-py3-none-any.whl
+COPY --chown=$username suzieq/config/etc/suzieq-cfg.yml /home/$username/.suzieq/suzieq-cfg.yml
+RUN sed -i 's/127.0.0.1/0.0.0.0/' /home/$username/.suzieq/suzieq-cfg.yml
+
 ENV PATH=/root/.local/bin:$PATH:/root/.local/lib/python3.7/site-packages/suzieq/cli/:/root/.local/lib/python3.7/site-packages/suzieq/poller/:/root/.local/lib/python3.7/site-packages/suzieq/restServer
 
-#ENV PYTHONPATH=/src/python-nubia
+USER $username
+WORKDIR /home/$username
 ENTRYPOINT ["/bin/bash"]
 
 # USER 1001

Dockerfile-demo

@@ -1,6 +1,8 @@
 FROM netenglabs/suzieq:latest
 
-COPY ./parquet /suzieq/parquet
+ARG username=suzieq
+
+COPY ./tests/data/parquet /home/$username/parquet
 
 LABEL name=suzieq-demo
 LABEL version=$version

build/requirements.txt

@@ -25,7 +25,7 @@ commonmark==0.9.1; python_full_version >= "3.6.2" and python_full_version < "4.0
 configargparse==0.15.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 cryptography==36.0.0; python_version >= "3.6"
 cycler==0.11.0; python_version >= "3.7"
-dateparser==1.1.0; python_version >= "3.5"
+dateparser==1.1.1; python_version >= "3.5"
 decorator==5.1.0; python_version >= "3.7"
 defusedxml==0.7.1; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7"
 dnspython==2.1.0; python_version >= "3.6"
@@ -78,7 +78,7 @@ parso==0.7.1; python_version >= "3.6" and python_full_version < "3.0.0" or pytho
 passlib==1.7.4; python_version >= "3.6"
 pexpect==4.8.0; sys_platform != "win32" and python_version >= "3.7"
 pickleshare==0.7.5; python_version >= "3.7"
-pillow==9.0.0; python_full_version >= "3.7.1" and python_version < "4.0" and python_version >= "3.7"
+pillow==9.0.1; python_full_version >= "3.7.1" and python_version < "4.0" and python_version >= "3.7"
 ply==3.11
 prettytable==2.4.0; python_version >= "3.6"
 prometheus-client==0.12.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.7"

docs/inventory.md

@@ -41,7 +41,7 @@ devices:
   devtype: eos
 
 - name: devices-using-rest
-  transport: rest
+  transport: https
 
 auths:
 - name: credentials-from-file-0
@@ -215,6 +215,8 @@ For example, if a set of devices is only reachable with a ssh jump, in `devices`
   port: 22
 ```
 
+The supported transport methods are `https` and `ssh`.
+
 In case you want to ignore the check of the device's key against the `known_hosts` file you can set:
 
 ```yaml