Skip to content

Fix Docker build to match Google Cloud Build script #186

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

Closed
politician wants to merge 2 commits into from
+9 −21
Closed

Fix Docker build to match Google Cloud Build script #186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b457cc
Fix Docker build to match Google Cloud Build script
politician Dec 7, 2021
72ad3db
Add buildozer and buildifier to Docker image
politician Feb 21, 2022
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
30 changes: 9 additions & 21 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM l.gcr.io/google/bazel:latest AS build

WORKDIR /usr/src/copybara

FROM gcr.io/cloud-builders/bazel:latest AS build
COPY . .

RUN bazel build //java/com/google/copybara:copybara_deploy.jar \
&& mkdir -p /tmp/copybara \
&& cp bazel-bin/java/com/google/copybara/copybara_deploy.jar /tmp/copybara/

# Fails currently
# RUN bazel test //...
RUN ./cloudbuild.sh build //java/com/google/copybara:copybara_deploy.jar
RUN mkdir -p /tmp/copybara && \
cp bazel-bin/java/com/google/copybara/copybara_deploy.jar /tmp/copybara/

FROM golang:latest AS buildtools

RUN go get github.com/bazelbuild/buildtools/buildozer
RUN go get github.com/bazelbuild/buildtools/buildifier

FROM openjdk:8-jre-slim
FROM openjdk:11-jre-slim
WORKDIR /usr/src/app
ENV COPYBARA_CONFIG=copy.bara.sky \
COPYBARA_SUBCOMMAND=migrate \
COPYBARA_OPTIONS='' \
Expand All @@ -39,12 +32,7 @@ ENV COPYBARA_CONFIG=copy.bara.sky \
COPY --from=build /tmp/copybara/ /opt/copybara/
COPY --from=buildtools /go/bin/buildozer /go/bin/buildifier /usr/bin/
COPY .docker/entrypoint.sh /usr/local/bin/copybara

RUN chmod +x /usr/local/bin/copybara

# Install git for fun times
RUN apt-get update \
&& apt-get install -y git \
&& apt-get clean

WORKDIR /usr/src/app
RUN apt-get update && \
apt-get install -y git && \
apt-get clean