diff --git a/Dockerfile b/Dockerfile index 4ee8add0..bca0015a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,5 +2,6 @@ FROM python:3.5 RUN pip install Flask==0.11.1 redis==2.10.5 RUN useradd -ms /bin/bash admin USER admin +COPY app /app WORKDIR /app CMD ["python", "app.py"] diff --git a/circle.yml b/circle.yml index 6abec304..37709910 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,7 @@ machine: dependencies: pre: + - sudo pip install --upgrade pip - sudo pip install docker-compose test: @@ -15,7 +16,7 @@ test: deployment: hub: - branch: [circle_ci_publish, master] + branch: /.*/ commands: - docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER_ID -p $DOCKER_HUB_PWD - docker tag dockerapp_dockerapp $DOCKER_HUB_USER_ID/dockerapp:$CIRCLE_SHA1 diff --git a/docker-compose.yml b/docker-compose.yml index ca8326e1..cceabce8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,8 +4,6 @@ services: build: . ports: - "5000:5000" - volumes: - - ./app:/app - + redis: image: redis:3.2.0