Skip to content

Commit

Permalink
ci: fix build_image build. (envoyproxy#3095)
Browse files Browse the repository at this point in the history
Signed-off-by: Harvey Tuch <[email protected]>
  • Loading branch information
htuch authored Apr 17, 2018
1 parent ce9d01d commit 8f62fe2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions ci/build_container/Dockerfile-centos
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM centos:7

COPY ./build_and_install_deps.sh ./recipe_wrapper.sh ./Makefile ./build_container_common.sh /
COPY WORKSPACE /bazel-prebuilt/
COPY ./api /bazel-prebuilt/api
COPY ./bazel /bazel-prebuilt/bazel
COPY ./build_recipes/*.sh /build_recipes/

Expand Down
1 change: 1 addition & 0 deletions ci/build_container/Dockerfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ FROM ubuntu:xenial

COPY ./build_and_install_deps.sh ./recipe_wrapper.sh ./Makefile ./build_container_common.sh /
COPY WORKSPACE /bazel-prebuilt/
COPY ./api /bazel-prebuilt/api
COPY ./bazel /bazel-prebuilt/bazel
COPY ./build_recipes/*.sh /build_recipes/

Expand Down
2 changes: 1 addition & 1 deletion ci/build_container/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
# We need //bazel/... and WORKSPACE for the build, but it's not in ci/build_container. Using Docker
# relative path workaround from https://github.com/docker/docker/issues/2745#issuecomment-253230025
# to get this to work.
tar cf - . -C ../../ bazel WORKSPACE \
tar cf - . -C ../../ bazel WORKSPACE api \
| docker build -f Dockerfile-${LINUX_DISTRO} -t ${IMAGE_NAME}:$CIRCLE_SHA1 -

0 comments on commit 8f62fe2

Please sign in to comment.