Commit Graph

26616 Commits

Author SHA1 Message Date
Daniel J Walsh 197de01e7c
Merge pull request #350 from rhatdan/unit
Fixes to allow unit test to pass on fedora 30
2019-05-17 04:51:36 -04:00
Giuseppe Scrivano 912e4b1f0b
Merge pull request #348 from cevich/hack_get_ci_vm.sh
Cirrus: Script to manually prov. CI-like VMs
2019-05-17 08:53:53 +02:00
Daniel J Walsh f71306a490
Fixes to allow unit test to pass on fedora 30
Fix unit test to ignore relatime
Update vendor to fix unit tests

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-16 21:34:23 -04:00
Nalin Dahyabhai 4d9afdc93f
Merge pull request #349 from cevich/fix_apt_get
cirrus: Add retry/timeout function for apt-get
2019-05-16 17:26:14 -04:00
Chris Evich d4532a8086
Only ignore container-storage in root
Previously, git was ignoring the pattern 'container-storage' everywhere.
Since changes to `cmd/container-storage` may be desirable, anchor the
pattern to the repo root only.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-16 16:41:01 -04:00
Chris Evich 6dc5b349df
Cirrus: Script to manually prov. CI-like VMs
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-16 16:40:57 -04:00
Chris Evich 449dd768ba
cirrus: Add retry/timeout function for apt-get
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-16 10:38:33 -04:00
Daniel J Walsh 03cc65ad48
Merge pull request #345 from cevich/cirrus_ci
Cirrus: Add initial support for Cirrus-CI
2019-05-16 04:52:48 -04:00
Valentin Rothberg 476d0be681
Merge pull request #344 from giuseppe/fix-fuse-overlayfs
tests: fix regression when using idmapping
2019-05-16 08:22:42 +02:00
Chris Evich 0293236464
Cirrus: Add meta task for tracking image use
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-15 16:31:22 -04:00
Chris Evich 247e35d8ec
Cirrus: Implement essential functions and scripts
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-15 16:29:16 -04:00
Chris Evich 83e2acd98a
Cirrus: Add initial support for Cirrus-CI
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-15 13:23:21 -04:00
Giuseppe Scrivano 91828c80e1
tests: disable idmaps test with mount_program
disable these tests when using fuse-overlayfs.  fuse-overlayfs has
support for IDs shifting, so it will end up to cancel the effect of
these tests.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-15 17:04:02 +02:00
Giuseppe Scrivano 5995d88179
chown: do not change owner for the mountpoint
This is already done by the driver when creating the directory, so we
will end up trying to map IDs that were already mapped.

regression introduced with d1554f0dcd
and 7c6d502e9b.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-15 17:02:31 +02:00
Daniel J Walsh 814e5aa0a8
Merge pull request #343 from rhatdan/master
Bump to latest release.
2019-05-10 10:08:20 -04:00
Daniel J Walsh ef67c7a41f
Move to v1.12.8-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-10 10:07:17 -04:00
Daniel J Walsh fb65405c4a
Bump to v1.12.7
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-10 10:06:14 -04:00
Giuseppe Scrivano 5121dc49e9
Merge pull request #342 from nalind/lock
locks: correctly mark updates to the layers list
2019-05-10 15:01:43 +02:00
Nalin Dahyabhai 104cf50abf Update generated files
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-08 14:42:51 -04:00
Nalin Dahyabhai b1822634c0 locks: correctly mark updates to the layers list
When saving the layers list, mark the list as having been updated by us.
Broken since 0183a293dc.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-08 14:40:49 -04:00
Nalin Dahyabhai 9a4328ef7c tests: check that we update last-writers when changing things
Make sure that the appropriate lock file's contents (the last-writer ID)
actually gets updated when we create layers, images, and containers.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-08 14:40:49 -04:00
Daniel J Walsh a97b757f6a
Merge pull request #341 from nalind/layerless
CreateContainer: don't worry about mapping layers unless necessary
2019-05-08 14:21:07 -04:00
Nalin Dahyabhai 88afc63e89 CreateContainer: don't worry about mapping layers unless necessary
When creating a container, don't worry about whether or not the base
image's top layer has the right ID mappings in cases where the base
image doesn't have a top layer.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-07 16:21:04 -04:00
Nalin Dahyabhai 85c846a2bb tests: test layerless images
Test creation of images without layers, and containers based on them.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-07 16:21:04 -04:00
Daniel J Walsh 09449630d3
Merge pull request #340 from Silvanoc/silvano/fix-manpage-containers-storage-conf
docs: fix manpage for containers-storage.conf
2019-05-05 07:10:49 -04:00
Silvano Cirujano Cuesta 8aff2c5797 doc: fix manpage for containers-storage.conf
Fix the sections and their titles in the manpage for containers-storage.conf.
Section titles are all capitalized and don't end with a period.

Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-05-04 21:17:55 +02:00
Silvano Cirujano Cuesta 0494196eed docs: sort configuration options alphabetically
Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-05-04 16:21:44 +02:00
Silvano Cirujano Cuesta bd33b0fabb docs: fix manpage for containers-storage.conf
Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-05-04 16:19:47 +02:00
Daniel J Walsh a95f4e7d35
Merge pull request #339 from Silvanoc/silvano/document-readonly-layers
Document OSTree deduplication and add manpage for import-layer
2019-05-03 12:45:06 -04:00
Silvano Cirujano Cuesta 4072df6f8d docs: add manpage for import-layer
Add the missing manpage for the subcommand import-layer.

Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-05-03 16:18:29 +02:00
Silvano Cirujano Cuesta dfa0a6c414 docs: document OSTree file deduplication
Add to the main manpage the reference to the fact that OSTree will be
used for file deduplication on readonly layers if:
* ostree_repo configured,
* containters-storage build with support for OSTree

That information was missing throughout all the documentation.

Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-05-03 16:18:29 +02:00
Daniel J Walsh 94f0324a5d
Merge pull request #338 from rhatdan/version
Version 1.12.6 Bump
2019-05-02 13:51:20 -04:00
Daniel J Walsh 1247f6266c
Move to v1.12.7-dev
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-02 12:54:51 -04:00
Daniel J Walsh eb8303b551
Bump to v1.12.6
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-02 12:54:47 -04:00
Daniel J Walsh 2488a2f70f
Merge pull request #337 from rhatdan/revert
Revert "Add MountTempFromSource and RemoveTemp interfaces"
2019-05-02 12:50:33 -04:00
Daniel J Walsh ef42340c2e
Revert "Add MountTempFromSource and RemoveTemp interfaces"
This reverts commit e9695564db.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-02 11:54:55 -04:00
Daniel J Walsh 91cf837e44
Merge branch 'master' of github.com:containers/storage 2019-05-02 10:36:36 -04:00
Daniel J Walsh 409dbaea65
Merge pull request #335 from rhatdan/man
Add missing options to man page for containers-storage
2019-05-02 10:31:21 -04:00
Daniel J Walsh 5fa856aeb2
Add missing options to man page for containers-storage
We were not documenting remap-uid and gid, need this documented in the man
pages.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-02 09:11:14 -04:00
Daniel J Walsh a3454a8f23
Merge pull request #336 from nalind/compile-fix
Compilation fixes
2019-05-02 09:10:56 -04:00
Nalin Dahyabhai 8d7b848bcb Compilation fixes
Add a couple of quick compilation fixes.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-01 23:37:07 -04:00
Daniel J Walsh 346d481c10
Merge pull request #334 from giuseppe/fix-ownership-layers
layers: use the correct idmapping when creating a layer
2019-05-01 15:28:46 -04:00
Giuseppe Scrivano d1554f0dcd
overlay: use the layer idmapping if present
prefer the custom idmapping specified for the layer instead of using
the global one configured for the driver.

Closes: https://github.com/containers/libpod/issues/2960

Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
2019-05-01 18:46:07 +02:00
Giuseppe Scrivano 7c6d502e9b
vfs: prefer layer custom idmappings
Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
2019-05-01 18:46:06 +02:00
Giuseppe Scrivano 77065edb97
layers: propagate down the idmapping settings
when creating a layer, propagate down the idmapping.

Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
2019-05-01 18:31:19 +02:00
Daniel J Walsh 3d7a61daa2
Merge pull request #333 from umohnani8/symlinks
Fix up recreateSymlink
2019-04-30 10:48:13 -04:00
Urvashi Mohnani 2581a719d5 Fix up recreateSymlink
Noticed that the link directory may be lost also with the symlinks,
so this fix creates it if not found and then restores all the links.
Also fix up logic to check wether a dir is found or not instead of
a regular file.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2019-04-29 18:00:10 -04:00
Daniel J Walsh e9695564db
Add MountTempFromSource and RemoveTemp interfaces
These interfaces can be used to setup a graphdriver mountpoint
of the source directory for use within a container.
The RemoveTemp interface umounts the mountpoint and then removes
all of the modified data in the graphdriver for this source directory.

The primary use case of these interfaces is for container engines that
want to mount a directory from the host system into the container. The
source dirctory then can be modified without actually changing the
directory on the host.

Containers will use these interfaces for sharing packaing cache directories
like /var/cache/dnf, to help speed up container builds.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-04-29 14:46:40 -04:00
Valentin Rothberg e90620ceae
Merge pull request #330 from Silvanoc/silvano/fix-manpages-build
docs: fix manpage for configuration file
2019-04-26 13:02:19 +02:00
Silvano Cirujano Cuesta 35217acd13 docs: add special handling for manpages in sect 5
The manpage of the configuration goes to section 5 instead of 1, like
most of the other manpages. Therefore the existing code wasn't handling
the manpage for 'containers-storage.conf' not appropriately.

Signed-off-by: Silvano Cirujano Cuesta <silvano.cirujano-cuesta@siemens.com>
2019-04-26 12:27:43 +02:00