diff options
| -rw-r--r-- | Dockerfile | 1 | ||||
| -rw-r--r-- | Dockerfile.centos | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | changelog.txt | 41 | ||||
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 2 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 1 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rwxr-xr-x | hack/install_catatonit.sh | 19 | ||||
| -rw-r--r-- | version/version.go | 2 |
9 files changed, 66 insertions, 8 deletions
diff --git a/Dockerfile b/Dockerfile index 1f51cd874..3c65bf5a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \ build-essential \ curl \ e2fslibs-dev \ + file \ gawk \ gettext \ go-md2man \ diff --git a/Dockerfile.centos b/Dockerfile.centos index 513c4bdfd..9af7ef7f1 100644 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -2,9 +2,12 @@ FROM registry.centos.org/centos/centos:7 RUN yum -y install btrfs-progs-devel \ atomic-registries \ + autoconf \ + automake \ bzip2 \ device-mapper-devel \ findutils \ + file \ git \ glibc-static \ glib2-devel \ @@ -15,6 +18,7 @@ RUN yum -y install btrfs-progs-devel \ libassuan-devel \ libseccomp-devel \ libselinux-devel \ + libtool \ containers-common \ runc \ make \ @@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= 0000afc1af06b04ececeb91637bb3d80d6f47e14 +EPOCH_TEST_COMMIT ?= d7eba026876e4a6a362464dcf08fe6757ebedd1a HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD diff --git a/changelog.txt b/changelog.txt index 1e9d17d06..7d6522c4d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,44 @@ +- Changelog for v1.6.0 (2019-09-30) + * info: add cgroups2 + * Finalize release notes for 1.6.0 final + * Bump github.com/onsi/ginkgo from 1.8.0 to 1.10.1 + * Bump github.com/docker/docker-credential-helpers from 0.6.2 to 0.6.3 + * Bump github.com/stretchr/testify from 1.3.0 to 1.4.0 + * Bump github.com/uber/jaeger-client-go + * Bump github.com/spf13/pflag from 1.0.3 to 1.0.5 + * update c/storage to v1.13.4 + * Cirrus: Minor, fix env. var. intention + * new examples added updated two examples with supported CMD and ENTRYPOINT syntax. + * new testcase for podman import --change added + * syntax updated for podman import --change + * Correct use of reexec.Init() + * Add a missing escape in the Makefile + * Change ginkgo Wait() to Eventually() test + * Set log-level immediately, before rootless setup + * Cirrus: Implement newly built VM images + * Add README note about security reporting process. + * Cirrus: Disable boottime Ubuntu package update + * Move noCache logic lower in stack + * cirrus: Add bash-completion support + * Add an error for pods without a name + * Make links relative in Tutorial README + * docs/podman-derivative-api.md: New file + * fix cp none exists dest path ends with '/' + * Dockerfile.fedora: install packages to build catatonit + * README: add Communications section + * drop OWNERS link for CONTRIBUTING.md + * Bump gitvalidation epoch + * Bump to v1.6.0-dev + * Handle conflict between volumes and --read-only-tmpfs + * Cirrus: Upload windows MSI release file + * conditionally send stdin on remote run + * Cirrus: VM Image accounting doc update + * Force a CNI Delete on refreshing containers + * Document the required varlink build args + * Update mac_client link + * Cirrus: Fail early on CI script unit test + * Unconditionally remove conmon files before starting + - Changelog for v1.6.0-rc2 (2019-09-24) * Add release notes for new-in-RC2 changes * system tests: run test: reenable and fix diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 8e0a2b2ee..679ad3b8d 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -37,6 +37,7 @@ ooe.sh sudo dnf install -y \ criu \ device-mapper-devel \ emacs-nox \ + file \ findutils \ fuse3 \ fuse3-devel \ @@ -61,6 +62,7 @@ ooe.sh sudo dnf install -y \ libseccomp \ libseccomp-devel \ libselinux-devel \ + libtool \ libvarlink-util \ lsof \ make \ diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index c94e74a08..2f54da9ed 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -61,6 +61,7 @@ $BIGTO $SUDOAPTGET install \ curl \ e2fslibs-dev \ emacs-nox \ + file \ gawk \ gcc \ gettext \ diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 6ac324499..dc734a6b4 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -39,7 +39,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 1.6.0 +Version: 1.6.1 Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh index e5532a200..7fd7592a9 100755 --- a/hack/install_catatonit.sh +++ b/hack/install_catatonit.sh @@ -1,15 +1,24 @@ #!/bin/bash -e BASE_PATH="/usr/libexec/podman" CATATONIT_PATH="${BASE_PATH}/catatonit" -CATATONIT_VERSION="v0.1.3" +CATATONIT_VERSION="v0.1.4" if [ -f $CATATONIT_PATH ]; then echo "skipping ... catatonit is already installed" else - echo "downloading catatonit to $CATATONIT_PATH" - curl -o catatonit -L https://github.com/openSUSE/catatonit/releases/download/$CATATONIT_VERSION/catatonit.x86_64 - chmod +x catatonit + echo "installing catatonit to $CATATONIT_PATH" + buildDir=$(mktemp -d) + git clone https://github.com/openSUSE/catatonit.git $buildDir + + pushd $buildDir + echo `pwd` + git reset --hard ${CATATONIT_VERSION} + autoreconf -fi + ./configure + make install ${SELINUXOPT} -d -m 755 $BASE_PATH install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH - rm catatonit + popd + + rm -rf $buildDir fi diff --git a/version/version.go b/version/version.go index 348a69594..9fcd5faa7 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "1.6.0-dev" +const Version = "1.6.1-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility |