Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
79f3ab4
Remove tty flag from unit-test run, for compat w/ Shippable
tgross Aug 29, 2016
d6d1a9e
Switch to Connector/Python for mysql lib
tgross Aug 30, 2016
2d97fd9
Run create_snapshot in same process as manage.py snapshot_task
tgross Aug 30, 2016
07f6d60
Give snapshot task user-friendly name for logs
tgross Aug 31, 2016
e907eb4
Provide tool to get generated root password from initial setup
tgross Aug 31, 2016
be7d04e
Remove USE_STANDBY option
tgross Aug 31, 2016
0057dab
Major refactoring for testability
tgross Aug 31, 2016
2a7a868
unit tests for config parsing and some low-hanging fruit
tgross Sep 7, 2016
a73f717
Proof-of-concept for using tracing hooks to unit test concurrent proc…
tgross Sep 7, 2016
d1c3496
Remove unncessary assertions in __init__.py
tgross Sep 8, 2016
298a49f
Unit testing for pre_start
tgross Sep 8, 2016
1d3dc9a
Unit testing for snapshot_task
tgross Sep 8, 2016
559ec6f
Cut down on setup for pre_start tests
tgross Sep 8, 2016
083539a
Clean up health check state machine, plus unit tests
tgross Sep 8, 2016
75152b3
Clean up unnecessary imports and arguments
tgross Sep 9, 2016
9a93fb5
No need to use TestNode for pre_start w/ mock.side_effect
tgross Sep 9, 2016
8d732cd
Make sure tests can't stomp on each other's config files
tgross Sep 9, 2016
4c96756
Clean up failover state machine, plus unit tests
tgross Sep 9, 2016
23ee690
While very clever, didn't need to run tests in steppable threads
tgross Sep 9, 2016
000978b
Move files for correct Python path packaging
tgross Sep 12, 2016
4b7029c
Move snapshot check frequency to something reasonable
tgross Sep 12, 2016
f0e0a6c
Clean up import errs with new layout, a couple integration test fixes
tgross Sep 12, 2016
bc7a0f8
more minor fixes
tgross Sep 12, 2016
f856e4d
Force local to use DEBUG logging for ease of development
tgross Sep 12, 2016
2c1068e
Make Consul check for primary use IP not name
tgross Sep 12, 2016
f446a1e
Return own IP for primary when 'show slave hosts' is valid
tgross Sep 12, 2016
a591207
Add makefile tooling to snag logs
tgross Sep 13, 2016
47c8a26
Fix debug logging decorator
tgross Sep 13, 2016
41ca4ab
Simplify test query parsing
tgross Sep 13, 2016
e8972e5
Move failover unlock to end of health check
tgross Sep 13, 2016
dcff6fe
Update README for new failover design
tgross Sep 14, 2016
72bee30
Inject links to ContainerPilot docs (#1)
misterbisson Sep 14, 2016
b51941b
Make sure TRITON_PROFILE is set during testing on Triton
tgross Sep 14, 2016
3046c76
Reorder guarantees paragraph in README for clarity
tgross Sep 14, 2016
f023f15
Add README section on upgrades
tgross Sep 15, 2016
0a5bccd
TOC in README
tgross Sep 15, 2016
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
16 changes: 12 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ RUN set -ex \
# \
# get Python drivers MySQL, Consul, and Manta \
# \
&& curl -Lvo /tmp/mysql-connector.deb http://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python_2.1.3-1debian8.2_all.deb \
&& dpkg -i /tmp/mysql-connector.deb \
&& curl -v -Lo /tmp/mysql-utils.deb http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-utilities_1.5.6-1debian8_all.deb \
&& dpkg -i /tmp/mysql-utils.deb \
&& curl -Lvo get-pip.py https://bootstrap.pypa.io/get-pip.py \
&& python get-pip.py \
&& pip install \
PyMySQL==0.6.7 \
python-Consul==0.4.7 \
manta==2.5.0 \
mock==2.0.0 \
Expand All @@ -41,13 +44,18 @@ RUN set -ex \
# clean up to minimize image layer size \
# \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get purge -y --auto-remove $buildDeps

&& apt-get purge -y --auto-remove $buildDeps \
&& rm /tmp/mysql-connector.deb \
&& rm /tmp/mysql-utils.deb \
&& rm /get-pip.py \
&& rm /docker-entrypoint.sh


# configure ContainerPilot and MySQL
COPY etc/* /etc/
COPY bin/* /usr/local/bin/
COPY bin/manager /usr/local/bin/manager
COPY bin/test.py /usr/local/bin/test.py
COPY bin/manage.py /usr/local/bin/manage.py

# override the parent entrypoint
ENTRYPOINT []
Expand Down
90 changes: 67 additions & 23 deletions README.md

Large diffs are not rendered by default.

Loading