summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt69
-rw-r--r--commands-demo.md2
-rw-r--r--contrib/gate/Dockerfile4
-rw-r--r--docs/Readme.md2
-rw-r--r--pkg/domain/infra/abi/system_varlink.go2
5 files changed, 75 insertions, 4 deletions
diff --git a/changelog.txt b/changelog.txt
index 552a17663..ca850c848 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,72 @@
+- Changelog for v2.0.0-rc2 (2020-05-22)
+ * Attempt to turn on integration tests
+ * Removes remote system reset functionality. skip e2e test for remote.
+ * Attempt to turn on special_testing_endpoing tests
+ * Attempt to turn on varlink tests
+ * Attempt to turn on rpmbuild tests
+ * Bump github.com/containers/common from 0.11.2 to 0.11.4
+ * Enables iidfile test as issue fixed now
+ * [CI:DOCS] Docs revamp.
+ * Fix podman-remote start tests
+ * podman version --format ... was not working
+ * Display human build date in podman info
+ * remote manifest test
+ * Turn on more remote tests
+ * v2 podman-remote build
+ * Fix podman-remote stop --all to handle not running containers
+ * Enable rmi test
+ * Bump github.com/opencontainers/go-digest from 1.0.0-rc1 to 1.0.0
+ * Remove github.com/libpod/libpod from cmd/pkg/podman
+ * Start testing with cross compilation
+ * Fixes podman pod create --pod-id-file #6292
+ * remote untag test
+ * Get proper exit code when running or starting a container.
+ * vendor: update seccomp/containers-golang to v0.4.1
+ * Bump github.com/containers/storage from 1.19.2 to 1.20.1
+ * Bump github.com/onsi/ginkgo from 1.12.0 to 1.12.2
+ * Handle filters correctly for podman prune
+ * Fix remote handling of podman images calls
+ * Bump k8s.io/api from 0.18.2 to 0.18.3
+ * Bump github.com/onsi/gomega from 1.10.0 to 1.10.1
+ * Enable system prune test remote client
+ * Fix build on OS X
+ * Update Derivative API tutorial to reflect the HTTP API
+ * Turn off 'noexec' option by default for named volumes
+ * enable remote integration tests for init
+ * Add a test for detached exec
+ * Update manpage for `podman exec` to include detach flag
+ * Enable cleanup processes for detached exec
+ * Add ability to clean up exec sessions with cleanup
+ * Add CLI frontend for detached exec
+ * Add backend code for detached exec
+ * Add exit commands to exec sessions
+ * enable pod_create remote integration tests
+ * Fix remote integration for healthchecks
+ * Fix create_test for remote integration
+ * govern remote attach and start
+ * Test fixes for remote integration
+ * V2 API Version Support
+ * Print container state when erroring that it is improper
+ * system tests: more podman-pod tests
+ * don't skip log tests unless remote
+ * [CI:DOCS] Image tree endpoint should return 404
+ * oci conmon: tell conmon to log container name
+ * add go-bindings for `hack/podman-registry`
+ * New tool: hack/podman-registry, manages local registry
+ * Testcase added for network commands
+ * format option added to network inspect command.
+ * filter option added to network ls command.
+ * Fix mountpont in SecretMountsWithUIDGID
+ * Update troubleshoot page
+ * v2 enable remote integration tests
+ * Get MAC, Windows and Linux podman-remote from latest version links.
+ * V2 Implement terminal handling in bindings attach
+ * Fix EOM for SendFile
+ * Bump to v2.0.0-dev
+ * Give `auto-update` ability to use per-container authfile specified by label.
+ * system tests: small fixes for rawhide+cgroups v1
+ * Add HairpinMode to our CNI configs
+
- Changelog for v2.0.0-rc1 (2020-05-18)
* v2endpoint remove image path correction
* Drop APIv2 resize endpoint
diff --git a/commands-demo.md b/commands-demo.md
index a32fdbcad..555f83af9 100644
--- a/commands-demo.md
+++ b/commands-demo.md
@@ -28,8 +28,10 @@
| [podman-history(1)](https://podman.readthedocs.io/en/latest/markdown/podman-history.1.html) | Shows the history of an image |
| [podman-image(1)](https://podman.readthedocs.io/en/latest/image.html) | Manage Images |
| [podman-image-exists(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-exists.1.html) | Check if an image exists in local storage |
+| [podman-image-diff(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-diff.html) | Inspect changes on an image's filesystem. |
| [podman-image-prune(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-prune.1.html) | Remove all unused images from the local store |
| [podman-image-sign(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-sign.1.html) | Create a signature for an image |
+| [podman-image-search(1)](https://podman.readthedocs.io/en/latest/markdown/podman-search.1.html) | Search a registry for an image. |
| [podman-image-tree(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-tree.1.html) | Prints layer hierarchy of an image in a tree format |
| [podman-image-trust(1)](https://podman.readthedocs.io/en/latest/markdown/podman-image-trust.1.html) | Manage container registry image trust policy |
| [podman-images(1)](https://podman.readthedocs.io/en/latest/markdown/podman-images.1.html) | List images in local storage | [![...](/docs/source/markdown/play.png)](https://podman.io/asciinema/podman/images/) | [Here](https://github.com/containers/Demos/blob/master/podman_cli/podman_images.sh) |
diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index 9042ddeb4..a6d927e2b 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -10,9 +10,9 @@ ENV GOPATH="/var/tmp/go" \
COPY / $GOSRC
# Install packages from dependencies.txt, ignoring commented lines
-# Note: adding conmon so podman command checks will work
+# Note: adding conmon and crun so podman command checks will work
RUN dnf -y install \
- $(grep "^[^#]" $GOSRC/contrib/dependencies.txt) conmon \
+ $(grep "^[^#]" $GOSRC/contrib/dependencies.txt) conmon crun \
&& dnf clean all
# Install dependencies
diff --git a/docs/Readme.md b/docs/Readme.md
index 4d10cfa56..987a5b8e4 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -1,7 +1,7 @@
# Podman Documentation
The online man pages and other documents regarding Podman can be found at
-[Read The Docs](https://podman.readthedocs.io/en/latest/index.html). The man pages
+[Read The Docs](https://podman.readthedocs.io). The man pages
can be found under the [Commands](https://podman.readthedocs.io/en/latest/Commands.html)
link on that page.
diff --git a/pkg/domain/infra/abi/system_varlink.go b/pkg/domain/infra/abi/system_varlink.go
index c0144babe..4dc766f52 100644
--- a/pkg/domain/infra/abi/system_varlink.go
+++ b/pkg/domain/infra/abi/system_varlink.go
@@ -39,7 +39,7 @@ func (ic *ContainerEngine) VarlinkService(_ context.Context, opts entities.Servi
if err = service.Listen(opts.URI, opts.Timeout); err != nil {
switch err.(type) {
case varlink.ServiceTimeoutError:
- logrus.Infof("varlink service expired (use --timeout to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String())
+ logrus.Infof("varlink service expired (use --time to increase session time beyond %s ms, 0 means never timeout)", opts.Timeout.String())
return nil
default:
return errors.Wrapf(err, "unable to start varlink service")