Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/Dockerfile-envoy-alpine
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM frolvlad/alpine-glibc

ADD build_release_stripped/envoy /usr/local/bin/envoy
3 changes: 3 additions & 0 deletions ci/Dockerfile-envoy-alpine-debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM frolvlad/alpine-glibc

ADD build_release/envoy /usr/local/bin/envoy
6 changes: 1 addition & 5 deletions ci/Dockerfile-envoy-image
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
FROM ubuntu:14.04

ADD build_release/envoy /usr/local/bin/envoy
RUN apt-get update && apt-get install -y \
build-essential
RUN strip /usr/local/bin/envoy
RUN apt-get purge -y build-essential
ADD build_release_stripped/envoy /usr/local/bin/envoy
5 changes: 0 additions & 5 deletions ci/build_alpine_container/Dockerfile-envoy-alpine

This file was deleted.

5 changes: 0 additions & 5 deletions ci/build_alpine_container/Dockerfile-envoy-alpine-debug

This file was deleted.

38 changes: 0 additions & 38 deletions ci/build_alpine_container/Makefile

This file was deleted.

48 changes: 0 additions & 48 deletions ci/build_alpine_container/run_alpine_binary_verification.sh

This file was deleted.

4 changes: 2 additions & 2 deletions ci/coverage_publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ then
COVERAGE_DIR="$(dirname "${COVERAGE_FILE}")"
S3_LOCATION="lyft-envoy/coverage/report-${BRANCH_NAME}"

aws s3 cp "${COVERAGE_DIR}" "s3://${S3_LOCATION}" --recursive --profile coverage --acl public-read --quiet --sse
pip install awscli --upgrade
aws s3 cp "${COVERAGE_DIR}" "s3://${S3_LOCATION}" --recursive --acl public-read --quiet --sse
echo "Coverage report for branch '${BRANCH_NAME}': https://s3.amazonaws.com/${S3_LOCATION}/coverage.html"

else
echo "Coverage report will not be uploaded for this build."
fi
3 changes: 3 additions & 0 deletions ci/do_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ function bazel_release_binary_build() {
echo "Copying release binary for image build..."
mkdir -p "${ENVOY_SRCDIR}"/build_release
cp -f "${ENVOY_DELIVERY_DIR}"/envoy "${ENVOY_SRCDIR}"/build_release
mkdir -p "${ENVOY_SRCDIR}"/build_release_stripped
cp -f "${ENVOY_DELIVERY_DIR}"/envoy "${ENVOY_SRCDIR}"/build_release_stripped
strip "${ENVOY_SRCDIR}"/build_release_stripped/envoy
}

function bazel_debug_binary_build() {
Expand Down
18 changes: 9 additions & 9 deletions ci/docker_push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ then
docker build -f ci/Dockerfile-envoy-image -t lyft/envoy:latest .
docker login -u "$DOCKERHUB_USERNAME" -p "$DOCKERHUB_PASSWORD"
docker push lyft/envoy:latest
docker tag lyft/envoy:latest lyft/envoy:$CIRCLE_SHA1
docker push lyft/envoy:$CIRCLE_SHA1
docker rm $(docker ps -a -q) || true
docker rmi $(docker images -a -q) || true
docker tag lyft/envoy:latest lyft/envoy:"$CIRCLE_SHA1"
docker push lyft/envoy:"$CIRCLE_SHA1"

make -C ci/build_alpine_container
docker tag lyft/envoy-alpine:latest lyft/envoy-alpine:$CIRCLE_SHA1
docker push lyft/envoy-alpine:$CIRCLE_SHA1
docker build -f ci/Dockerfile-envoy-alpine -t lyft/envoy-alpine:latest .
docker tag lyft/envoy-alpine:latest lyft/envoy-alpine:"$CIRCLE_SHA1"
docker push lyft/envoy-alpine:"$CIRCLE_SHA1"
docker push lyft/envoy-alpine:latest
docker tag lyft/envoy-alpine-debug:latest lyft/envoy-alpine-debug:$CIRCLE_SHA1
docker push lyft/envoy-alpine-debug:$CIRCLE_SHA1

docker build -f ci/Dockerfile-envoy-alpine-debug -t lyft/envoy-alpine-debug:latest .
docker tag lyft/envoy-alpine-debug:latest lyft/envoy-alpine-debug:"$CIRCLE_SHA1"
docker push lyft/envoy-alpine-debug:"$CIRCLE_SHA1"
docker push lyft/envoy-alpine-debug:latest

# This script tests the docker examples.
Expand Down