Merge branch 'release-v5.8.10'

Author: qrkourier

.github/workflows/main.yml

@@ -144,19 +144,8 @@ jobs:
     - name: Build & Push Multi-Platform Container
       uses: docker/build-push-action@v2
       with:
-        context: . # build context is workspace so we can copy artifacts from ./dist/
+        context: ./docker # build context is workspace so we can copy artifacts from ./dist/
         builder: ${{ steps.buildx.outputs.name }}
         platforms: linux/amd64,linux/arm64
         push: true
         tags: ${{ steps.compose_tags.outputs.container_tags }}
-
-    - name: Demo Container
-      if: github.event.action == 'published'
-      uses: docker/build-push-action@v2
-      with:
-        context: . # build context is workspace so we can copy artifacts from ./dist/
-        file: Dockerfile.demo
-        builder: ${{ steps.buildx.outputs.name }}
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: netfoundry/python:demo

docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.9-slim-buster
-COPY ./dist/netfoundry-*.tar.gz /tmp/
+COPY ./dist/netfoundry-*.whl /tmp/
 RUN pip install --upgrade pip
-RUN pip install /tmp/netfoundry-*.tar.gz
-RUN rm -f /tmp/netfoundry-*.tar.gz
+RUN pip install /tmp/netfoundry-*.whl
+RUN rm -f /tmp/netfoundry-*.whl
 CMD ["nfctl --version"]

docker/Dockerfile.demo

@@ -1,4 +1,2 @@
 FROM netfoundry/python
-ARG network_name=BibbidiBobbidiBoo
-ENV NETWORK_NAME=${network_name}
-CMD nfdemo --network ${NETWORK_NAME}
+CMD nfctl --yes demo