Merge lp:~jelmer/loggerhead/docker-improvements into lp:loggerhead

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Colin Watson
Approved revision: 516
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~jelmer/loggerhead/docker-improvements
Merge into: lp:loggerhead
Diff against target: 20 lines (+3/-5)
1 file modified
Dockerfile (+3/-5)
To merge this branch: bzr merge lp:~jelmer/loggerhead/docker-improvements
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+405854@code.launchpad.net

Commit message

Some docker image improvements.

Description of the change

Some docker image improvements:

* use sid-slim as base image (we don't need manpages, etc)
* don't specify arguments that users may want to skip
* remove TODO items - users can just pass those arguments to the image

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :
Revision history for this message
Colin Watson (cjwatson) wrote :

The py35 tests fail:

14:20:21 O: Traceback (most recent call last):
14:20:21 O: File "<string>", line 1, in <module>
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/setup.py", line 771, in <module>
14:20:21 O: setup(**ARGS)
14:20:21 O: File "/usr/lib/python3.5/distutils/core.py", line 148, in setup
14:20:21 O: dist.run_commands()
14:20:21 O: File "/usr/lib/python3.5/distutils/dist.py", line 955, in run_commands
14:20:21 O: self.run_command(cmd)
14:20:21 O: File "/usr/lib/python3.5/distutils/dist.py", line 974, in run_command
14:20:21 O: cmd_obj.run()
14:20:21 O: File "/workspace/loggerhead/loggerhead/work/.tox/py35/lib/python3.5/site-packages/setuptools/command/install.py", line 61, in run
14:20:21 O: return orig.install.run(self)
14:20:21 O: File "/usr/lib/python3.5/distutils/command/install.py", line 583, in run
14:20:21 O: self.run_command('build')
14:20:21 O: File "/usr/lib/python3.5/distutils/cmd.py", line 313, in run_command
14:20:21 O: self.distribution.run_command(command)
14:20:21 O: File "/usr/lib/python3.5/distutils/dist.py", line 974, in run_command
14:20:21 O: cmd_obj.run()
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/setup.py", line 182, in run
14:20:21 O: generate_docs.main(argv=["brz", "man"])
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/tools/generate_docs.py", line 96, in main
14:20:21 O: infogen_mod.infogen(options, outfile)
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/doc_generate/autodoc_man.py", line 54, in infogen
14:20:21 O: outfile.write(man_escape(getcommand_list(params)))
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/doc_generate/autodoc_man.py", line 85, in getcommand_list
14:20:21 O: for cmd_name in command_name_list():
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/doc_generate/autodoc_man.py", line 71, in command_name_list
14:20:21 O: command_names = breezy.commands.builtin_command_names()
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/commands.py", line 234, in builtin_command_names
14:20:21 O: _register_builtin_commands()
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/commands.py", line 192, in _register_builtin_commands
14:20:21 O: import breezy.builtins
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/builtins.py", line 24, in <module>
14:20:21 O: import breezy.git
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/git/__init__.py", line 313, in <module>
14:20:21 O: from ..branch import (
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/branch.py", line 38, in <module>
14:20:21 O: from . import (
14:20:21 O: File "/tmp/pip-build-i7t0_1g5/breezy/breezy/revision.py", line 52
14:20:21 O: parent_ids: List[RevisionID]
14:20:21 O: ^
14:20:21 O: SyntaxError: invalid syntax

Revision history for this message
Colin Watson (cjwatson) wrote :

Fixing this in https://code.launchpad.net/~cjwatson/loggerhead/pin-breezy-py35/+merge/406290, and if that works I'll try landing this again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dockerfile'
2--- Dockerfile 2021-06-02 16:07:58 +0000
3+++ Dockerfile 2021-07-17 11:13:11 +0000
4@@ -1,13 +1,11 @@
5-FROM debian:sid
6+FROM debian:sid-slim
7
8 # Simple docker file for loggerhead
9 # To use, mount something on /code
10-# TODO(jelmer): Support toggling --export-tarballs
11-# TODO(jelmer): Support toggling whether writes are allowed (currently not allowed)
12-# TODO(jelmer): Support specifying host prefix
13+# Logs will be accessible at /logs
14
15 RUN apt update && apt install --no-install-recommends -y python3 python3-bleach python3-paste python3-pip python3-patiencediff python3-simpletal python3-dev build-essential python3-pastedeploy python3-dulwich python3-certifi python3-configobj && pip3 install breezy && apt clean && mkdir -p /logs
16 ADD . /opt/loggerhead
17 ENV PYTHONPATH=/opt/loggerhead
18 EXPOSE 8080/tcp
19-ENTRYPOINT ["/usr/bin/python3", "/opt/loggerhead/loggerhead-serve", "/code", "--host=0.0.0.0", "--port=8080", "--log-folder=/logs", "--export-tarballs", "--cache-dir=/tmp", "--prefix=/"]
20+ENTRYPOINT ["/usr/bin/python3", "/opt/loggerhead/loggerhead-serve", "/code", "--host=0.0.0.0", "--port=8080", "--log-folder=/logs", "--cache-dir=/tmp"]

Subscribers

People subscribed via source and target branches