summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2263 from cevich/longer_info_waitOpenShift Merge Robot2019-02-04
|\ | | | | Increase e2e info/json test exit timeout
| * Increase e2e info/json test exit timeoutChris Evich2019-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For whatever reason, this specific test frequently fails on Ubuntu with an error similar to: ``` Timed out after 1.000s. Expected process to exit. It did not. /var/tmp/go/src/github.com/containers/libpod/test/e2e/info_test.go:38 ``` Ths changes alters the test behavior to use the `defaultWaitTimeout` value (so 90 vs former 60 seconds) only for this test. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #2213 from cevich/cirrus_imgts_containerOpenShift Merge Robot2019-02-04
|\ \ | |/ |/| [skip ci] Cirrus: Container for tracking image use
| * [skip ci] Cirrus: Container for tracking image useChris Evich2019-01-24
| | | | | | | | | | | | | | Once built, this container can be utilized by automation to help keep track of VM images. All parameters are passed in via env. vars. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #2233 from TomSweeneyRedHat/dev/tsweeney/trustyOpenShift Merge Robot2019-02-02
|\ \ | | | | | | Touch up image-trust man
| * | Touch up image-trust manTomSweeneyRedHat2019-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> In #1899, @rhatdan asked me to try and tweak the verbiage a bit in the podman-images-trust man page. I've done so, or attempted to, and have also added a policy-json(5) link. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #2235 from TomSweeneyRedHat/dev/tsweeney/podmandescriptionOpenShift Merge Robot2019-02-02
|\ \ \ | |/ / |/| | Rework Podman description
| * | Rework Podman descriptionTomSweeneyRedHat2019-02-01
|/ / | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Rework the Podman Description. I'm starting off with the Podman man page to build consensus and we can then add to other places as appropriate. This partially addresses: #1636 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #2251 from wking/image-inspect-repo-digestsOpenShift Merge Robot2019-02-01
|\ \ | | | | | | libpod/image: Use RepoDigests() in Inspect()
| * | libpod/image: Use RepoDigests() in Inspect()W. Trevor King2019-01-31
| | | | | | | | | | | | | | | | | | | | | To get the more-robust handling from 0f6535cf (libpod/image: Use ParseNormalizedNamed in RepoDigests, 2019-01-08, #2106) here too. Signed-off-by: W. Trevor King <wking@tremily.us>
* | | Merge pull request #2255 from vrothberg/vendor-containers-imageOpenShift Merge Robot2019-02-01
|\ \ \ | | | | | | | | vendor latest containers/image
| * | | vendor latest containers/imageValentin Rothberg2019-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make docker destination threadsafe * use copy progress bars only when the fd points to a tty Please note that this is not a release over containers/image. For an upcoming release of libpod, we might consider vendoring the latest release of containers/image. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #2143 from QiWang19/continue2108OpenShift Merge Robot2019-02-01
|\ \ \ \ | | | | | | | | | | Fix up `image sign` in PR 2108
| * | | | Fix up `image sign` in PR 2108Qi Wang2019-01-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #2239 from bodunov/masterOpenShift Merge Robot2019-02-01
|\ \ \ \ \ | |_|/ / / |/| | | | Consistency in verbs in podman help command
| * | | | For consistency in usage output the verbs changed from 3rd person to 1st person.Ivan Bodunov2019-01-30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ivan Bodunov <ivan.bodunov@gmail.com>
* | | | | Merge pull request #2249 from rhatdan/masterOpenShift Merge Robot2019-02-01
|\ \ \ \ \ | | | | | | | | | | | | add Pod Manager References
| * | | | | add Pod Manager ReferencesDaniel J Walsh2019-01-31
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just to clarify where the name came from. We also now manage volumes so add that to the description. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2236 from baude/listcontainermountsmapOpenShift Merge Robot2019-02-01
|\ \ \ \ \ | | | | | | | | | | | | Alter varlink API for ListContainerMounts to return a map
| * | | | | Alter varlink API for ListContainerMounts to return a mapbaude2019-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to return a map of containermounts where the key is container id and it points to the mountpath. Issue #2215 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #2232 from baude/pstableOpenShift Merge Robot2019-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix regression in ps with custom format
| * | | | | | Fix regression in ps with custom formatbaude2019-01-30
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the table keyword in go templating had regressed and was no longer working. Fixes: 2221 Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #2195 from cevich/rhel7-testingOpenShift Merge Robot2019-02-01
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Cirrus: Add RHEL-7 testing
| * | | | | Set SELinux type on bin/podman after installChris Evich2019-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different components of testing reference the podman binary differently. While they are identical in content, their SELinux types are not the same, depending on build location. Avoid confusion and test failures by always matching the bin/podman SELinux type to that of $BINDIR/podman **after** install. This ensures even if the code or default contexts change, a subsequent `make install` will re-match the SELinux type. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Add RHEL-7 testingChris Evich2019-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary tweaks to base-image build/import process so that image can successfully boot with networking enabled. Build the base image and update ``.cirrus.yml`` accordingly. Also make a minor improvement to cache-image building to help save space in GCP image storage. Namely, instead of storing every produced image, export them into google storage buckets w/ life-cycle enabled. For production use, they may be converted back into GCE images, otherwise they will expire after a time. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #2244 from rhatdan/versionOpenShift Merge Robot2019-01-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for short option -f in podman version
| * | | | | | Add support for short option -f in podman versionDaniel J Walsh2019-01-30
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docker version supports a short options -f for --format Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #2243 from rhatdan/sizeOpenShift Merge Robot2019-01-30
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add support for short option -s in podman inspect
| * | | | | | Add support for short option -s in podman inspectDaniel J Walsh2019-01-30
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docker inspect supports a short -s option for --size. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #2242 from rhatdan/infoOpenShift Merge Robot2019-01-30
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add support for short option -f
| * | | | | Add support for short option -fDaniel J Walsh2019-01-30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | docker info supports a short -f option for --format. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2230 from rhatdan/quietOpenShift Merge Robot2019-01-30
|\ \ \ \ \ | |_|/ / / |/| | | | Make --quiet work in podman create/run
| * | | | Make --quiet work in podman create/runDaniel J Walsh2019-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --queit option is supposed to suppress the pulling messages when a new image is being pulled down. This patch fixes this issue. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2225 from cevich/enable_apparmorOpenShift Merge Robot2019-01-30
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: Enable AppArmor build and test
| * | | | | apparmor: don't load default profile in rootless modeValentin Rothberg2019-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppArmor requires root privileges, so skip loading the default profile in rootless mode. Also add a log to ease debugging. Fixes: #2223 Reported-by: @dmacvicar Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | | Cirrus: Enable AppArmor build and testChris Evich2019-01-29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was specifically disabled early on in transitioning to cirrus due to an excessive number of test failures and lack of knowledge. This commit reverses the stance and unifies build and test commands across all current platforms. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #2205 from baude/prunelikedockerOpenShift Merge Robot2019-01-30
|\ \ \ \ \ | |_|/ / / |/| | | | podman image prune -- implement all flag
| * | | | podman image prune -- implement all flagbaude2019-01-29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we now, by default, only prune dangling images. if --all is passed, we prune dangling images AND images that do not have an associated containers. also went ahead and enabled the podman-remote image prune side of things. Fixes: #2192 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2206 from cevich/image_oopsOpenShift Merge Robot2019-01-29
|\ \ \ \ | | | | | | | | | | Cirrus: Use freshly built images
| * | | | Cirrus: Use freshly built imagesChris Evich2019-01-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #2218 from ktdreyer/doc-updates-testingDaniel J Walsh2019-01-29
|\ \ \ \ \ | |_|/ / / |/| | | | tutorials: describe how to use podman in updates-testing
| * | | | tutorials: describe how to use podman in updates-testingKen Dreyer2019-01-25
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
* | | | Merge pull request #2220 from petoem/install-docsDaniel J Walsh2019-01-28
|\ \ \ \ | |/ / / |/| | | Update ArchLinux installation instructions
| * | | Update ArchLinux installation instructionsMichael Petö2019-01-26
|/ / / | | | | | | | | | | | | | | | Podman is available in the official repositories Signed-off-by: Michael Petö <michael@petoe.me>
* | | Merge pull request #2069 from mheon/warn_on_overriding_driverOpenShift Merge Robot2019-01-23
|\ \ \ | | | | | | | | Warn on overriding user-specified storage driver w/ DB
| * | | Warn on overriding user-specified storage driver w/ DBMatthew Heon2019-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overriding storage.conf is not intuitive behavior, so pop up an error message when it happens, so people know that bad things are happening. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2203 from 9034725985/patch-1OpenShift Merge Robot2019-01-23
|\ \ \ \ | |_|/ / |/| | | remove sudo
| * | | remove sudoKushal2019-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just tested with podman 1.0.0 on fedora 29 we don't need sudo I tried this again and it seems like we DO need sudo? Maybe I misunderstood something but looks like I am unable to reproduce getting an IP address also it would be nice if creating a check point (which I belive means writing to disk) could be done without root but I guess it depends on where on disk I am writing? in any case, here is my new console output ```console [kus@asus-vivobook personal]$ cd libpod/ [kus@asus-vivobook libpod]$ git checkout patch-1 Branch 'patch-1' set up to track remote branch 'patch-1' from 'origin'. Switched to a new branch 'patch-1' [kus@asus-vivobook libpod]$ podman run -dt -e HTTPD_VAR_RUN=/var/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ > -e HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \ > -e HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ > registry.fedoraproject.org/f29/httpd /usr/bin/run-httpd Trying to pull registry.fedoraproject.org/f29/httpd...Getting image source signatures Copying blob 281a37f51f75: 85.68 MiB / 85.68 MiB [=======================] 1m47s Copying blob ab0d48faadd2: 4.64 MiB / 4.64 MiB [=========================] 1m47s Copying blob e1bf69dce18d: 49.77 MiB / 49.77 MiB [=======================] 1m47s Copying config 532763348c4e: 6.66 KiB / 6.66 KiB [==========================] 0s Writing manifest to image destination Storing signatures 78917177dbf7634993fdcc44e0bc90c9422482b9a9e757c85c14dfd1ee09c777 [kus@asus-vivobook libpod]$ podman ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 78917177dbf7 registry.fedoraproject.org/f29/httpd:latest container-entrypo... 4 seconds ago Up 3 seconds ago nifty_lewin [kus@asus-vivobook libpod]$ podman inspect -l | grep IPAddress\" "IPAddress": "", [kus@asus-vivobook libpod]$ sudo podman inspect -l | grep IPAddress\" [sudo] password for kus: no such container [kus@asus-vivobook libpod]$ podman logs --latest => sourcing 10-set-mpm.sh ... => sourcing 20-copy-config.sh ... => sourcing 40-ssl-certs.sh ... AH00558: httpd: Could not reliably determine the server's fully qualified domain name, using 10.0.2.100. Set the 'ServerName' directive globally to suppress this message [Tue Jan 22 12:59:38.887673 2019] [ssl:warn] [pid 1:tid 140100965338496] AH01909: 10.0.2.100:8443:0 server certificate does NOT include an ID which matches the server name AH00558: httpd: Could not reliably determine the server's fully qualified domain name, using 10.0.2.100. Set the 'ServerName' directive globally to suppress this message [Tue Jan 22 12:59:38.998169 2019] [ssl:warn] [pid 1:tid 140100965338496] AH01909: 10.0.2.100:8443:0 server certificate does NOT include an ID which matches the server name [Tue Jan 22 12:59:38.998876 2019] [lbmethod_heartbeat:notice] [pid 1:tid 140100965338496] AH02282: No slotmem from mod_heartmonitor [Tue Jan 22 12:59:39.001562 2019] [cgid:error] [pid 28:tid 140100965338496] (13)Permission denied: AH01243: Couldn't bind unix domain socket /run/httpd/cgisock.1 [Tue Jan 22 12:59:39.006051 2019] [mpm_event:notice] [pid 1:tid 140100965338496] AH00489: Apache/2.4.37 (Fedora) OpenSSL/1.1.1-pre9 configured -- resuming normal operations [Tue Jan 22 12:59:39.006164 2019] [core:notice] [pid 1:tid 140100965338496] AH00094: Command line: 'httpd -D FOREGROUND' [Tue Jan 22 12:59:39.006445 2019] [cgid:crit] [pid 1:tid 140100965338496] AH01238: cgid daemon failed to initialize [kus@asus-vivobook libpod]$ podman top 78917177dbf7634993fdcc44e0bc90c9422482b9a9e757c85c14dfd1ee09c777 USER PID PPID %CPU ELAPSED TTY TIME COMMAND default 1 0 0.000 2m10.968144627s pts/0 0s httpd -D FOREGROUND default 24 1 0.000 2m9.968688975s pts/0 0s /usr/bin/coreutils --coreutils-prog-shebang=cat /usr/bin/cat default 25 1 0.000 2m9.968784295s pts/0 0s /usr/bin/coreutils --coreutils-prog-shebang=cat /usr/bin/cat default 26 1 0.000 2m9.968880829s pts/0 0s /usr/bin/coreutils --coreutils-prog-shebang=cat /usr/bin/cat default 27 1 0.000 2m9.968997468s pts/0 0s /usr/bin/coreutils --coreutils-prog-shebang=cat /usr/bin/cat default 29 1 0.000 2m9.969134191s pts/0 0s httpd -D FOREGROUND default 38 1 0.000 2m9.969239549s pts/0 0s httpd -D FOREGROUND default 72 1 0.000 2m9.969344456s pts/0 0s httpd -D FOREGROUND [kus@asus-vivobook libpod]$ podman container checkpoint 78917177dbf7634993fdcc44e0bc90c9422482b9a9e757c85c14dfd1ee09c777 checkpointing a container requires root [kus@asus-vivobook libpod]$ podman stop --latest 78917177dbf7634993fdcc44e0bc90c9422482b9a9e757c85c14dfd1ee09c777 [kus@asus-vivobook libpod]$ podman ps -a CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 78917177dbf7 registry.fedoraproject.org/f29/httpd:latest container-entrypo... 3 minutes ago Exited (0) 9 seconds ago nifty_lewin [kus@asus-vivobook libpod]$ podman rm --latest 78917177dbf7634993fdcc44e0bc90c9422482b9a9e757c85c14dfd1ee09c777 ``` original: ```console [kus@mcny ~]$ podman run -dt -e HTTPD_VAR_RUN=/var/run/httpd -e HTTPD_MAIN_CONF_D_PATH=/etc/httpd/conf.d \ > -e HTTPD_MAIN_CONF_PATH=/etc/httpd/conf \ > -e HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \ > registry.fedoraproject.org/f27/httpd /usr/bin/run-httpd Trying to pull registry.fedoraproject.org/f27/httpd...Getting image source signatures Copying blob ff3dab903f92: 80.73 MiB / 80.73 MiB [=========================] 14s Copying blob 9347d6e9d864: 7.30 MiB / 7.30 MiB [===========================] 14s Copying blob 2fc5c44251d4: 44.82 MiB / 44.82 MiB [=========================] 14s Copying config 18f01f6f77ef: 6.55 KiB / 6.55 KiB [==========================] 0s Writing manifest to image destination Storing signatures d0362571c3850159315778700a63a305296150177578a9339cca0d9c86ed97f1 [kus@mcny ~]$ podman ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES d0362571c385 registry.fedoraproject.org/f27/httpd:latest container-entrypo... 36 seconds ago Up 36 seconds ago happy_babbage [kus@mcny ~]$ ``` Signed-off-by: Kushal <kushaldeveloper@gmail.com>
* | | | Merge pull request #2199 from baude/remoteversionOpenShift Merge Robot2019-01-22
|\ \ \ \ | | | | | | | | | | enable podman-remote version
| * | | | enable podman-remote versionbaude2019-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial enablement of podman-remote version. includes add a APIVersion const that will allow us to check compatibility between host/client when connections are made. also added client related information to podman info. Signed-off-by: baude <bbaude@redhat.com>