diff options
| author | Eric Anderson <ejona@google.com> | 2018-03-28 17:15:36 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-03-28 17:24:07 -0700 |
| commit | cdbfdd8da86be37e9150f55982c291f4a02e2ecb (patch) | |
| tree | 1519cf41a1ee055face25a9f32fbe33e2d5b6bba /protoc-artifacts/Dockerfile | |
| parent | 67c1cd4cb7d347241bc7a9e6989a0a6a062e4607 (diff) | |
| download | protobuf-cdbfdd8da86be37e9150f55982c291f4a02e2ecb.tar.gz protobuf-cdbfdd8da86be37e9150f55982c291f4a02e2ecb.tar.bz2 protobuf-cdbfdd8da86be37e9150f55982c291f4a02e2ecb.zip | |
protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1
ENTRYPOINT is used even when other commands are specified on the "docker
run" command line. This allows running one-off commands in the docker
image (especially combined with volume binding with the host) with the
correct environment variables.
Diffstat (limited to 'protoc-artifacts/Dockerfile')
| -rw-r--r-- | protoc-artifacts/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protoc-artifacts/Dockerfile b/protoc-artifacts/Dockerfile index 26446937..c346586b 100644 --- a/protoc-artifacts/Dockerfile +++ b/protoc-artifacts/Dockerfile @@ -39,5 +39,7 @@ RUN wget http://people.centos.org/tru/devtools-1.1/devtools-1.1.repo -P /etc/yum devtoolset-1.1-libstdc++-devel.i686 && \ yum clean all +COPY scl-enable-devtoolset.sh /var/local/ + # Start in devtoolset environment that uses GCC 4.7 -CMD ["scl", "enable", "devtoolset-1.1", "bash"] +ENTRYPOINT ["/var/local/scl-enable-devtoolset.sh"] |