Pin to libseccomp 2.3.3

lib seccomp 2.4 has huge performance regressions.
This change pins to 2.3.3 where that is not an issue

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2019-08-23 15:15:23 +00:00
parent 80ed8e1a64
commit b5f03eacd3
2 changed files with 38 additions and 1 deletions

View File

@ -34,7 +34,6 @@ addons:
- libprotobuf-c0-dev - libprotobuf-c0-dev
- libprotobuf-dev - libprotobuf-dev
- socat - socat
- libseccomp-dev
before_install: before_install:
- uname -r - uname -r
@ -48,6 +47,7 @@ install:
- go get -u github.com/vbatts/git-validation - go get -u github.com/vbatts/git-validation
- go get -u github.com/kunalkushwaha/ltag - go get -u github.com/kunalkushwaha/ltag
- go get -u github.com/LK4D4/vndr - go get -u github.com/LK4D4/vndr
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-seccomp ; fi
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-runc ; fi - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-runc ; fi
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-cni ; fi - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-cni ; fi
- if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-critools ; fi - if [ "$TRAVIS_GOOS" = "linux" ]; then sudo PATH=$PATH GOPATH=$GOPATH script/setup/install-critools ; fi

37
script/setup/install-seccomp Executable file
View File

@ -0,0 +1,37 @@
#!/usr/bin/env bash
# Copyright The containerd Authors.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Builds and installs runc to /usr/local/go/bin based off
# the commit defined in vendor.conf
#
set -eu -o pipefail
set -x
export SECCOMP_VERSION="2.3.3"
export SECCOMP_PATH="$(mktemp -d)"
curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" | tar -xzC "$SECCOMP_PATH" --strip-components=1
(
cd "$SECCOMP_PATH"
./configure --prefix=/usr/local
make
make install
ldconfig
)
rm -rf "$SECCOMP_PATH"