Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ python:
- '2.6'
- '2.7'
install:
- pip install .
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
- pip install .
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed this was wrong. It needs to install requirements.txt first because that has pinned versions, after it can install fig itself and all deps should already be installed.

script:
- script/validate-dco
- flake8 fig
Expand Down
13 changes: 9 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
FROM ubuntu:14.04
RUN apt-get update -qq && apt-get install -qy python python-pip python-dev
ADD requirements.txt /code/
RUN apt-get update -qq && apt-get install -qy python python-pip python-dev git
RUN useradd -d /home/user -m -s /bin/bash user
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are added separately so they are cached.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I didn't realize that worked

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep – a few versions ago, Docker started storing the hashsum of the tarball of an ADD to detect if the contents have changed. It's pretty sweet.


WORKDIR /code/

ADD requirements.txt /code/
RUN pip install -r requirements.txt

ADD requirements-dev.txt /code/
RUN pip install -r requirements-dev.txt

ADD . /code/
RUN python setup.py develop
RUN useradd -d /home/user -m -s /bin/bash user
RUN python setup.py install

RUN chown -R user /code/
USER user
4 changes: 2 additions & 2 deletions fig/cli/command.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from __future__ import unicode_literals
from __future__ import absolute_import
from ..packages.docker import Client
from docker import Client
from requests.exceptions import ConnectionError
import errno
import logging
import os
import re
import yaml
from ..packages import six
import six

from ..project import Project
from ..service import ConfigError
Expand Down
2 changes: 1 addition & 1 deletion fig/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from .log_printer import LogPrinter
from .utils import yesno

from ..packages.docker.errors import APIError
from docker.errors import APIError
from .errors import UserError
from .docopt_command import NoSuchCommand

Expand Down
2 changes: 1 addition & 1 deletion fig/cli/verbose_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging
import pprint

from fig.packages import six
import six


def format_call(args, kwargs):
Expand Down
Empty file removed fig/packages/__init__.py
Empty file.
20 changes: 0 additions & 20 deletions fig/packages/docker/__init__.py

This file was deleted.

7 changes: 0 additions & 7 deletions fig/packages/docker/auth/__init__.py

This file was deleted.

167 changes: 0 additions & 167 deletions fig/packages/docker/auth/auth.py

This file was deleted.

Loading