Merge pull request #12 from CybercentreCanada/assemblyline/issues/101

Assemblyline/issues/101 (dev)

.vscode/settings.json

@@ -18,21 +18,15 @@
         "--profile=black",
         // "--src=${workspaceFolder}"
     ],
-    "python.formatting.autopep8Args": [
-        "--max-line-length",
-        "120",
-        "--experimental"
-    ],
-    "python.formatting.provider": "autopep8",
-    "python.formatting.blackArgs": [
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter"
+    },
+    "black-formatter.args": [
         "--line-length=120"
     ],
-    "python.linting.enabled": true,
-    "python.linting.flake8Enabled": true,
-    "python.linting.flake8Args": [
+    "flake8.args": [
         "--max-line-length=120",
         //Added the ignore of E203 for now : https://github.com/PyCQA/pycodestyle/issues/373
         "--ignore=E203,W503"
     ],
-    "python.linting.pylintEnabled": false,
 }

CONTRIBUTING.md

@@ -5,7 +5,7 @@ This guide covers the basics of how to contribute to the Assemblyline project.
 Python code should follow the PEP8 guidelines defined here: [PEP8 Guidelines](https://www.python.org/dev/peps/pep-0008/).
 
 ## Tell us want you want to build/fix
-Before you start coding anything you should connect with the [Assemblyline community](https://groups.google.com/d/forum/cse-cst-assemblyline) to make sure no one else is working on the same thing and that whatever you are going to build still fits with the vision off the system.
+Before you start coding anything you should connect with the Assemblyline community via the [Assemblyline Discord server](https://discord.gg/GUAy9wErNu) and/or the [central Assemblyline GitHub project](https://github.com/CybercentreCanada/assemblyline/issues) to make sure no one else is working on the same thing and that whatever you are going to build still fits with the vision of the system.
 
 ## Git workflow
 
@@ -22,4 +22,4 @@ If you've worked on a new service that you want to be included in the default se
 
 Even if you try to merge in your pull request, you will be denied. Only a few people in our team are allowed to merge code into our repositories.
 
-We check for new pull requests every day and will merge them in once they have been approved by someone in our team.
+We check for new pull requests every day and will merge them in once they have been approved by someone in our team.

Dockerfile

@@ -4,8 +4,10 @@ FROM cccs/assemblyline-v4-service-base:$branch
 ENV SERVICE_PATH unpacker.Unpacker
 
 USER root
-
-RUN apt-get update && apt-get install -y upx-ucl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y wget
+RUN wget http://ftp.de.debian.org/debian/pool/main/u/upx-ucl/upx-ucl_3.96-2_amd64.deb && \
+    apt install -y ./upx-ucl_3.96-2_amd64.deb && \
+    rm -f upx-ucl_3.96-2_amd64.deb
 
 # Switch to assemblyline user
 USER assemblyline
@@ -20,4 +22,4 @@ USER root
 RUN sed -i -e "s/\$SERVICE_TAG/$version/g" service_manifest.yml
 
 # Switch to assemblyline user
-USER assemblyline
+USER assemblyline