From 74f3d3bce6dd574ef7e11a7e3f55832ff3fa3d04 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 16 Feb 2018 09:25:55 +0300 Subject: [PATCH] travis --- .travis.yml | 2 ++ Dockerfile-armhf | 19 ++++++++----------- docker-compose.yaml | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99000a7..d27f71f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ jobs: curl -L -o qemu-arm-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/v2.6.0/qemu-arm-static.tar.gz && tar xzf qemu-arm-static.tar.gz && popd + #copy it to container + - sed -i -e '2iCOPY tmp/qemu-arm-static /usr/bin/qemu-arm-static\' Dockerfile-$ARCH # build - docker build -t $PROJECT -f Dockerfile-$ARCH . diff --git a/Dockerfile-armhf b/Dockerfile-armhf index 72cd93b..e232bc0 100644 --- a/Dockerfile-armhf +++ b/Dockerfile-armhf @@ -3,16 +3,13 @@ FROM arm32v7/python:slim ENV LIBRARY_PATH=/lib:/usr/lib ADD src/requirements.txt / -COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static -RUN /usr/bin/apt-get update +RUN apt-get update && apt-get install -y build-essential autoconf \ + && pip install --upgrade pip && pip install -r /requirements.txt \ + && apt-get remove -y build-essential autoconf \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* -#RUN apt-get update && apt-get install -y build-essential autoconf \ -# && pip install --upgrade pip && pip install -r /requirements.txt \ -# && apt-get remove -y build-essential autoconf \ -# && apt-get autoremove -y \ -# && rm -rf /var/lib/apt/lists/* +WORKDIR /app +COPY src /app -#WORKDIR /app -#COPY src /app - -#CMD ["python3", "-u", "/app/main.py"] +CMD ["python3", "-u", "/app/main.py"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 6c55f82..d3d9b21 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ aqara: build: . - dockerfile: Dockerfile-rpi + dockerfile: Dockerfile-armhf container_name: aqara volumes: - "./config:/app/config"