diff options
| author |  Eric Anderson <ejona@google.com> | 2018-03-28 16:58:47 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-03-28 17:24:07 -0700 |
| commit | 5f052ae7ae8a757dd919e95e0f1481e08fef749b (patch) | |
| tree | 8139d57ea3f3dffaee9d65c3a523f93f532403f5 /protoc-artifacts | |
| parent | 7bf47a6b5d10382a4b427677cf7ca9288f4e2833 (diff) | |
protoc-artifacts: Avoid checking out protobuf code
It is a bad idea to check out code into the docker image, as it will be
out-of-date. It is better to have the image just be the environment, and
let any scripts that need source check them out themselves.
This fixes #4419 in that it allows the image to build again, albeit
users would need to use wget to grab the source of the version of
protobuf they wish.
Diffstat (limited to 'protoc-artifacts')
| -rw-r--r-- | protoc-artifacts/Dockerfile | 2 | ||||
| -rw-r--r-- | protoc-artifacts/README.md | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/protoc-artifacts/Dockerfile b/protoc-artifacts/Dockerfile index 43e6863c..82cd97ec 100644 --- a/protoc-artifacts/Dockerfile +++ b/protoc-artifacts/Dockerfile @@ -35,7 +35,5 @@ RUN rpm --rebuilddb && yum install -y devtoolset-1.1 \ devtoolset-1.1-libstdc++-devel \ devtoolset-1.1-libstdc++-devel.i686 -RUN git clone --depth 1 https://github.com/google/protobuf.git - # Start in devtoolset environment that uses GCC 4.7 CMD ["scl", "enable", "devtoolset-1.1", "bash"] diff --git a/protoc-artifacts/README.md b/protoc-artifacts/README.md index ba3ca018..d11cde5d 100644 --- a/protoc-artifacts/README.md +++ b/protoc-artifacts/README.md @@ -143,7 +143,11 @@ To run the image: $ docker run -it --rm=true protoc-artifacts ``` -The Protobuf repository has been cloned into ``/protobuf``. +To checkout protobuf (run within the container): +``` +$ # Replace v3.5.1 with the version you want +$ wget -O - https://github.com/google/protobuf/archive/v3.5.1.tar.gz | tar xvzp +``` ### Tips for deploying on Windows Under Windows the following error may occur: ``gpg: cannot open tty `no tty': |