Skip to content

ci: fix some issues post #837. #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 4 commits into from
Apr 27, 2017
Merged

ci: fix some issues post #837. #851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2951b
ci: fix some issues post #837.
htuch Apr 27, 2017
290a96d
Path fix.
htuch Apr 27, 2017
716137d
Remove -e
htuch Apr 27, 2017
c480fd9
A word to the wise.
htuch Apr 27, 2017
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
4 changes: 2 additions & 2 deletions ci/build_alpine_container/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ binary:
mkdir -p ./bin/debug
mkdir -p ./bin/configs
docker run -t -i --name build-envoy-alpine-ct -v ${ROOT_DIR}/../../:/source -v $(ENVOY_BUILD_DIR):/build lyft/envoy-build:latest /bin/bash -c \
"set -x && cd /source &&
"set -x && cd /source && \
cp /build/envoy/source/exe/envoy /tmp/envoy && \
cd /tmp/ && strip envoy && \
mv /tmp/envoy /source/ci/build_alpine_container/bin/stripped/ && \
cp /source/build_normal/source/exe/envoy /source/ci/build_alpine_container/bin/debug/ && \
cp /build/envoy/source/exe/envoy /source/ci/build_alpine_container/bin/debug/ && \
cp /source/configs/google_com_proxy.json /source/ci/build_alpine_container/bin/configs/"
docker rm -f build-envoy-alpine-ct
# Fail build if a core file gets generated during the build.
Expand Down
8 changes: 5 additions & 3 deletions ci/docker_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#!/bin/bash

# Do not ever set -x here, it is a security hazard as it will place the credentials below in the
# Travis logs.
set -e
set -x

# this is needed to verify the example images
docker build -f ci/Dockerfile-envoy-image -t lyft/envoy:latest .
# verify the Alpine build even when we're not pushing it
make -C ci/build_alpine_container

# push the envoy image on merge to master
want_push='false'
Expand All @@ -17,11 +20,10 @@ do
done
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$want_push" == "true" ]
then
docker login -e $DOCKER_EMAIL -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker push lyft/envoy:latest
docker tag lyft/envoy:latest lyft/envoy:$TRAVIS_COMMIT
docker push lyft/envoy:$TRAVIS_COMMIT
make -C ci/build_alpine_container
docker tag lyft/envoy-alpine:latest lyft/envoy-alpine:$TRAVIS_COMMIT
docker push lyft/envoy-alpine:$TRAVIS_COMMIT
docker push lyft/envoy-alpine:latest
Expand Down