Fixup dockerfile, requirements, upgrade android gradle.

I'll merge this stuff in tracking for now, as there's some other stuff I'm working on and want these latest changes in.
This commit is contained in:
Piv
2020-08-23 21:06:13 +09:30
parent 57e90c495f
commit 2dcc0d8bca
5 changed files with 18 additions and 8 deletions

View File

@@ -1,4 +1,7 @@
FROM python:3.6-slim
FROM vato.ddns.net:8083/python:3
ARG PYPI_USERNAME
ARG PYPI_PASSWORD
RUN apt-get update
# OpenCV has a LOT of dependencies.
@@ -17,14 +20,14 @@ RUN apt-get install -y \
&& rm -rf /var/lib/apt/lists/*
COPY requirements.txt /
RUN pip install --trusted-host pypi.python.org -r requirements.txt
RUN pip install --index-url https://${PYPI_USERNAME}:${PYPI_PASSWORD}@vato.ddns.net/nexus/repository/pypi-grouped/simple -r requirements.txt
WORKDIR /app
COPY . /app
COPY ./src /app
# We aren't listening, just connecting, so probs won't need this.
# EXPOSE 1883
ENV PYTHONPATH=/app
CMD ["python", "DecisionSystem/CentralisedDecision/cameraserver.py", "-V", "/app/HandRecognitionMacbookFixed.mp4"]
CMD ["python", "-m", "car"]