Merge pull request #59 from CybercentreCanada/container-build-options

Container build options (dev)

docker/Dockerfile

@@ -1,9 +1,11 @@
 ARG branch=latest
-FROM cccs/assemblyline-core:$branch
+ARG base=cccs/assemblyline-core
+FROM $base:$branch
 ARG version
 
 # Install assemblyline UI
-RUN pip install --no-cache-dir --user assemblyline-service-server==$version && rm -rf ~/.cache/pip
+COPY setup.py dist* dist/
+RUN pip install --no-cache-dir -f dist --user assemblyline-service-server==$version && rm -rf ~/.cache/pip
 
 # run the app
 CMD ["gunicorn", "assemblyline_service_server.patched:app", "--config=python:assemblyline_service_server.gunicorn_config", "--worker-class", "gevent"]

pipelines/azure-build.yaml

@@ -154,7 +154,7 @@ stages:
 
               for IMAGE in "cccs/assemblyline-service-server" "docker.pkg.github.com/cybercentrecanada/assemblyline/assemblyline-service-server"
               do
-                docker build --build-arg version=$VERSION --build-arg branch=$BUILD_TYPE -t $IMAGE:$TAG -t $IMAGE:$BUILD_TYPE -t $IMAGE:$SERIES docker
+                docker build --build-arg version=$VERSION --build-arg branch=$BUILD_TYPE -t $IMAGE:$TAG -t $IMAGE:$BUILD_TYPE -t $IMAGE:$SERIES . -f docker/Dockerfile
                 docker push $IMAGE --all-tags
               done