summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* WIP for using apt-cacher-ng with our Docker-based builder.feature/7530-docker-with-apt-cacher-ngTails developers2015-01-225-0/+41
|
* Use more idiomatic Makefile rule.Tails developers2015-01-221-4/+3
|
* Improve comment.Tails developers2015-01-221-1/+1
|
* Move tails_builder's files into its own sub-folder.Tails developers2015-01-217-7/+20
| | | | | We're gonna deal with multiple Docker contexts (the builder's, and an apt cacher's) so this will make things more organized.
* Use the correct variable as Docker volume.Tails developers2015-01-211-1/+1
|
* Use adapted version of Vagrant's build script with Docker.Tails developers2015-01-213-1/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The differences are: * The script itself determines if enough RAM is available to do a RAM build. We probably want to add a FORCE_RAM_BUILD flag that will make the script fail when we want to force a RAM build. * We do not cache Tails' Git on disk inside the container, and similarly we do not cache the wiki build results. This was a pretty smart feature in our Vagrant setup, but at the moment a build explicitly makes it so the container isn't saved (`run --rm`) so some extra work is needed if we want this type of caching (probably we'd have separate Makefile steps for syncing the Git repo, and building the wiki). However, the primary reason for not caching Tails Git inside the container is that it would end up in aufs (since Docker itself uses it) and hence cannot be used as the lower layer in the aufs union we used for RAM builds; aufs-on-aufs is not possible. * To follow Docker's nomenclature, we have renamed Vagrant's "WORKSPACE" to "WORKDIR". The actual work is still done in the BUILD_DIR, so that name isn't perfect, perhaps. * We drop all of live-build's caching (previously we unnecessarily stored the bootstrap stage cache). * We always run `lb clean --all` like if we set TAILS_CLEAN_BUILD in Vagrant, just because it seems like a saner default, in particular when we explicitly do not cache anything.
* Dockerfile: optimize the ordering of steps for better cache handling.Tails developers2015-01-201-1/+2
| | | | | Generally, a step shouldn't be declared before other steps unless they depend on it.
* Dockerfile: use COPY instead of ADD.Tails developers2015-01-201-4/+4
| | | | | For our current usecase they work just the same, but COPY's behavior is simpler, so it's recommended by the best practices for writing Dockerfiles.
* Makefile: rework variable names.Tails developers2015-01-201-6/+6
|
* Dockerfile: sort package names alphanumerically.Tails developers2015-01-201-1/+1
|
* Slightly refactor Makefile to leave room for using more than one container.Tails developers2015-01-201-1/+3
| | | | E.g. we'll soon want another container to run apt-cacher-ng.
* Give Makefile targets more expressive names.Tails developers2015-01-201-3/+3
|
* Reindent Dockerfile a bit.Tails developers2015-01-201-22/+22
|
* Fix the way we're passing the build command to Docker.Tails developers2015-01-201-1/+1
|
* Drop unused environment variable.Tails developers2015-01-201-1/+1
|
* Always upgrade the builder Docker container before building.Tails developers2015-01-201-1/+1
|
* Move the build command to a Makefile variable.Tails developers2015-01-201-1/+2
|
* Fix Dockerfile.Tails developers2015-01-201-1/+1
|
* Add security and updates Debian archives to the Docker builder container.Tails developers2015-01-201-0/+2
|
* Don't use unauthenticated APT.Tails developers2015-01-201-1/+0
| | | | (Dammit.)
* Import our APT repository's signing key into the Docker builder container.Tails developers2015-01-201-1/+3
|
* Move the setup_container's steps to the Dockerfile.Tails developers2015-01-206-23/+12
|
* Disable live-build's caching when building with Docker.Tails developers2015-01-201-1/+1
|
* Set a maintainer address that's still supported.Tails developers2015-01-201-1/+1
|
* Roll back the "Docker image name based on current branch" logic.Tails developers2015-01-201-2/+3
| | | | | | It's not compatible with our branch naming habits, and we've never offered that much flexibility yet. If this feature wants to come back, it'll need quite some thought and polishing.
* Update and fix build dependencies.Tails developers2015-01-201-1/+3
|
* Use a Debian Wheezy base image for the Docker builder container.Tails developers2015-01-202-8/+6
| | | | Let's not experiment with more than one thing at a time.
* Import initial Docker support patch.Tails developers2015-01-203-0/+66
| | | | Thanks to jvoisin!
* Merge branch 'stable' into develTails developers2015-01-192-4/+9
|\
| * Merge remote-tracking branch 'origin/bugfix/8714-tor-is-ready-robustness' ↵Tails developers2015-01-192-4/+9
| |\ | | | | | | | | | into stable
| | * Test 'Tor is ready' notification in a separate scenario (Will-fix: #8714).Tails developers2015-01-162-4/+9
| |/ | | | | | | | | | | | | | | Sikuli isn't reliably detecting the notification, either because it disappears too quickly given Wheezy's GNOME3's hardcoded timeout of five seconds, or because it fails to show at all. Any way, this often introduces failure of the 'Tor is ready' step, so this should improve the robustness of the test suite.
* | Merge branch 'stable' into develTails developers2015-01-190-0/+0
|\ \ | |/ | | | | | | Conflicts: debian/changelog
| * Add dummy changelog entry.Tails developers2015-01-151-0/+6
| |
* | Merge remote-tracking branch 'origin/master' into develTails developers2015-01-15121-9593/+11192
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/binary_rootfs/squashfs.sort config/chroot_local-includes/usr/local/sbin/unsafe-browser debian/changelog features/i2p.feature In the conflict resolution we move the update disabling parts of the unsafe-browser script to its prefs file, which is the new home for such configurations after the merge (into devel) of bugfix/7951-refactor-chroot-browsers.
| * | Remove past entries from the calendar.Tails developers2015-01-151-6/+0
| | |
| * | Merge remote-tracking branch 'origin/stable'Tails developers2015-01-15100-9080/+10446
| |\ \ | | |/
| | * releasing version 1.2.3Tails developers2015-01-158-97/+96
| | |
| | * Remove control char from translation file.Tails developers2015-01-151-4/+2
| | |
| | * Bump a timeout, again.Tails developers2015-01-151-2/+2
| | | | | | | | | | | | Same reason as in commit 06cf945e.
| | * Bump timeout.Tails developers2015-01-151-1/+1
| | |
| | * Update upgrade-description files.Tails developers2015-01-152-13/+28
| | |
| | * Updating SquashFS sort file1.2.3Tails developers2015-01-141-4135/+4056
| | |
| | * Update PO files.Tails developers2015-01-143-57/+51
| | |
| | * Fix ikiwiki markup syntax.Tails developers2015-01-141-1/+1
| | |
| | * Drop bullet list that only has one element.Tails developers2015-01-141-10/+8
| | |
| | * Update website PO files.Tails developers2015-01-1411-16/+829
| | |
| | * Remove release step that has been automated.Tails developers2015-01-141-4/+1
| | |
| | * Fill in security notice placeholders.Tails developers2015-01-141-2/+4
| | |
| | * Add placeholder for missing security fix entries.Tails developers2015-01-141-0/+2
| | |
| | * Improve release notes and changelog for 1.2.3.Tails developers2015-01-142-27/+30
| | |