From cdbfdd8da86be37e9150f55982c291f4a02e2ecb Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 28 Mar 2018 17:15:36 -0700 Subject: 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. --- protoc-artifacts/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'protoc-artifacts/Dockerfile') 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"] -- cgit v1.2.3