This commit is contained in:
Your Name
2018-02-16 00:58:36 +03:00
parent 6bd16ded60
commit 7ee0cfadc7
2 changed files with 5 additions and 3 deletions
+4 -3
View File
@@ -4,7 +4,8 @@ services:
env: env:
global: global:
- IMAGE_NAME=$DOCKER_USERNAME/aqara-mqtt - PROJECT=aqara-mqtt
- IMAGE_NAME=$DOCKER_USERNAME/$PROJECT
jobs: jobs:
include: include:
@@ -18,7 +19,7 @@ jobs:
- docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker run --rm --privileged multiarch/qemu-user-static:register --reset
# build # build
- docker build -t $IMAGE_NAME -f Dockerfile-$ARCH . - docker build -t $PROJECT -f Dockerfile-$ARCH .
# push image # push image
- > - >
@@ -26,6 +27,6 @@ jobs:
docker images docker images
echo $IMAGE_NAME echo $IMAGE_NAME
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
docker tag $IMAGE_NAME $IMAGE_NAME:$VERSION-$ARCH docker tag $PROJECT $IMAGE_NAME:$VERSION-$ARCH
docker push $IMAGE_NAME:$VERSION-$ARCH docker push $IMAGE_NAME:$VERSION-$ARCH
fi fi
+1
View File
@@ -6,6 +6,7 @@ ENV LIBRARY_PATH=/lib:/usr/lib
#RUN apt-get update && apt-get install -y build-essential autoconf \ #RUN apt-get update && apt-get install -y build-essential autoconf \
# && pip install --upgrade pip && pip install -r /requirements.txt \ # && pip install --upgrade pip && pip install -r /requirements.txt \
# && apt-get remove -y build-essential autoconf \ # && apt-get remove -y build-essential autoconf \
# && apt-get autoremove -y \
# && rm -rf /var/lib/apt/lists/* # && rm -rf /var/lib/apt/lists/*
WORKDIR /app WORKDIR /app