diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-09 09:31:44 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2020-12-09 15:53:23 -0800 |
| commit | a855a814d601a4c30f26743ef1bf016df956e042 (patch) | |
| tree | b017a831f6eff9c9734663114bbdf39fc4b6ffc7 /images/default | |
| parent | f6cb96bd57dec4e3baa8c57ccdeb0f1d8706b682 (diff) | |
Refactor the Makefile to avoid recursive Make.
Recursive make is difficult to follow and debug. Drop this by using
internal functions, which, while difficult, are easier than trying to
following recursive invokations.
Further simplify the Makefile by collapsing the image bits and removing
the tools/vm directory, which is effectively unused.
Fixes #4952
PiperOrigin-RevId: 346569133
Diffstat (limited to 'images/default')
| -rw-r--r-- | images/default/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/images/default/Dockerfile b/images/default/Dockerfile index d058b83cb..4b484d55b 100644 --- a/images/default/Dockerfile +++ b/images/default/Dockerfile @@ -6,7 +6,7 @@ RUN pip install --no-cache-dir pycparser RUN dnf install -y bazel3 # Install gcloud. RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-289.0.0-linux-x86_64.tar.gz | \ - tar zxvf - google-cloud-sdk && \ + tar zxf - google-cloud-sdk && \ google-cloud-sdk/install.sh && \ ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud # Install Docker client for the website build. |