Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2020-07-23 14:49:32 +0000
committerSravan Kumar Lakkimsetti2020-07-23 14:49:32 +0000
commit7b0e5f1d5a4fda7b7f989455a979c2ec5e7bf0b3 (patch)
tree4aa1cd7811697aa4d17568159ee2654570e0cab6
parent013b9ce326390338c21c8006ac4254a7d5a0b0d0 (diff)
downloadeclipse.platform.releng.aggregator-7b0e5f1d5a4fda7b7f989455a979c2ec5e7bf0b3.tar.gz
eclipse.platform.releng.aggregator-7b0e5f1d5a4fda7b7f989455a979c2ec5e7bf0b3.tar.xz
eclipse.platform.releng.aggregator-7b0e5f1d5a4fda7b7f989455a979c2ec5e7bf0b3.zip
Bug 565364 - Move SWT gerrit build to use custom docker image
Change-Id: Ie141c22e6d62b52c9a023012fd91f1d7bbf103c6 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild-gerrit/Dockerfile7
-rw-r--r--cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild/Dockerfile3
2 files changed, 6 insertions, 4 deletions
diff --git a/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild-gerrit/Dockerfile b/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild-gerrit/Dockerfile
index 4b47110c2..f1cfb3c80 100644
--- a/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild-gerrit/Dockerfile
+++ b/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild-gerrit/Dockerfile
@@ -50,7 +50,8 @@ RUN mkdir -p ${HOME}/.vnc && chmod -R 775 ${HOME} \
RUN cd ${HOME} && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > ${HOME}/setup-rust.sh \
&& chmod 755 ${HOME}/setup-rust.sh \
- && ${HOME}/setup-rust.sh -y && export PATH=${HOME}/.cargo/bin:${PATH}
+ && ${HOME}/setup-rust.sh -y
+ENV PATH=$HOME/.cargo/bin:$PATH
RUN mkdir -p ${HOME}/cef-libs && wget -O ${HOME}/cef-libs/cef.tar.bz2 --no-verbose http://opensource.spotify.com/cefbuilds/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2
@@ -59,8 +60,8 @@ RUN mkdir -p ${HOME}/maven && wget -O ${HOME}/maven/maven.tar.gz --no-verbose ht
&& tar xzf maven.tar.gz
RUN chmod -R 755 ${HOME}
-RUN export JAVA_HOME=/usr/lib/jvm/java-11
-RUN export PATH=${JAVA_HOME}/bin:${HOME}/maven/apache-maven-3.6.3/bin:${PATH}
+ENV JAVA_HOME=/usr/lib/jvm/java-11
+ENV PATH=$JAVA_HOME/bin:$HOME/maven/apache-maven-3.6.3/bin:$PATH
RUN chmod -R 777 ${HOME}/.cargo
diff --git a/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild/Dockerfile b/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild/Dockerfile
index f5cb765d3..054809ef1 100644
--- a/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild/Dockerfile
+++ b/cje-production/dockerfiles/centos-gtk3-metacity/7-swtBuild/Dockerfile
@@ -49,7 +49,8 @@ RUN mkdir -p ${HOME}/.vnc && chmod -R 775 ${HOME} \
RUN cd ${HOME} && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > ${HOME}/setup-rust.sh \
&& chmod 755 ${HOME}/setup-rust.sh \
- && ${HOME}/setup-rust.sh -y && export PATH=${HOME}/.cargo/bin:${PATH}
+ && ${HOME}/setup-rust.sh -y
+ENV PATH=$HOME/.cargo/bin:$PATH
RUN mkdir -p ${HOME}/cef-libs && wget -O ${HOME}/cef-libs/cef.tar.bz2 --no-verbose http://opensource.spotify.com/cefbuilds/cef_binary_3.3071.1649.g98725e6_linux64_minimal.tar.bz2

Back to the top