Browse Source

HPCC-23601 Rearrange docker files to reduce rebuild times

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 years ago
parent
commit
de8411063c

+ 0 - 3
dockerfiles/eclagent/Dockerfile

@@ -20,9 +20,6 @@
 ARG BUILD_LABEL
 FROM hpccsystems/platform-core:${BUILD_LABEL}
 
-USER root
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
-
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/eclagent
 WORKDIR /var/lib/HPCCSystems/eclagent

+ 0 - 3
dockerfiles/eclccserver/Dockerfile

@@ -20,9 +20,6 @@
 ARG BUILD_LABEL
 FROM hpccsystems/platform-core:${BUILD_LABEL}
 
-USER root
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
-
 USER hpcc
 RUN mkdir -p /var/lib/HPCCSystems/eclccserver
 WORKDIR /var/lib/HPCCSystems/eclccserver

+ 2 - 0
dockerfiles/platform-core-debug/Dockerfile

@@ -24,6 +24,8 @@ RUN apt-get install -y \
     dnsutils \
     nano 
 
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
+
 RUN groupadd -g 1000 hpcc
 RUN useradd -s /bin/bash -r -N -c "hpcc runtime User" -u 999 -g hpcc hpcc
 RUN passwd -l hpcc 

+ 2 - 0
dockerfiles/platform-core/Dockerfile

@@ -55,6 +55,8 @@ RUN apt-get install -y \
     dnsutils \
     nano 
 
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
+
 COPY --from=build /opt/HPCCSystems /
 
 RUN groupadd -g 1000 hpcc