Skip to content

Commit 246dd10

Browse files
author
Bernd Doser
committed
add semicolon before fi
1 parent daad69e commit 246dd10

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

eclipse-cpp-2018-09/Dockerfile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,25 @@ LABEL maintainer="Bernd Doser <[email protected]>"
66
RUN apt-get update \
77
&& apt-get install -y --no-install-recommends \
88
firefox \
9-
libgtk-3-0 \
10-
&& apt-get clean \
11-
&& rm -rf /var/lib/apt/lists/*
9+
libgtk-3-0
1210

1311
RUN if [ $(grep DISTRIB_RELEASE=16.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
1412
apt-get install -y --no-install-recommends \
15-
openjdk-8-jdk \
16-
&& apt-get clean \
17-
&& rm -rf /var/lib/apt/lists/* \
13+
openjdk-8-jdk; \
1814
fi
1915

2016
RUN if [ $(grep DISTRIB_RELEASE=18.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
2117
apt-get install -y --no-install-recommends \
22-
openjdk-11-jdk \
23-
&& apt-get clean \
24-
&& rm -rf /var/lib/apt/lists/* \
18+
openjdk-11-jdk; \
2519
fi
2620

21+
RUN apt-get clean \
22+
&& rm -rf /var/lib/apt/lists/*
23+
2724
RUN pip3 install -I jinja2
2825

29-
#ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/2018-09/R/eclipse-cpp-2018-09-linux-gtk-x86_64.tar.gz
30-
ENV DOWNLOAD_URL http://ftp.fau.de/eclipse/technology/epp/downloads/release/2018-09/R/eclipse-cpp-2018-09-linux-gtk-x86_64.tar.gz
26+
ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/2018-09/R/eclipse-cpp-2018-09-linux-gtk-x86_64.tar.gz
27+
#ENV DOWNLOAD_URL http://ftp.fau.de/eclipse/technology/epp/downloads/release/2018-09/R/eclipse-cpp-2018-09-linux-gtk-x86_64.tar.gz
3128
ENV SHA512 4d93be6701169021315439e8f8ba25c4a33e584487443c10ad23e81748838ec64e4fa6540d6ec03a60d1dc313b2b6b57f8edfdabe5895b9d82d084725cda7d8c
3229
ENV INSTALLATION_DIR /usr/local
3330

eclipse-cpp-2018-12/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@ LABEL maintainer="Bernd Doser <[email protected]>"
66
RUN apt-get update \
77
&& apt-get install -y --no-install-recommends \
88
firefox \
9-
libgtk-3-0 \
10-
&& apt-get clean \
11-
&& rm -rf /var/lib/apt/lists/*
9+
libgtk-3-0
1210

1311
RUN if [ $(grep DISTRIB_RELEASE=16.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
1412
apt-get install -y --no-install-recommends \
15-
openjdk-8-jdk \
16-
&& apt-get clean \
17-
&& rm -rf /var/lib/apt/lists/* \
13+
openjdk-8-jdk; \
1814
fi
1915

2016
RUN if [ $(grep DISTRIB_RELEASE=18.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
2117
apt-get install -y --no-install-recommends \
22-
openjdk-11-jdk \
23-
&& apt-get clean \
24-
&& rm -rf /var/lib/apt/lists/* \
18+
openjdk-11-jdk; \
2519
fi
2620

21+
RUN apt-get clean \
22+
&& rm -rf /var/lib/apt/lists/*
23+
2724
RUN pip3 install -I jinja2
2825

2926
ENV DOWNLOAD_URL http://download.eclipse.org/technology/epp/downloads/release/2018-12/R/eclipse-cpp-2018-12-R-linux-gtk-x86_64.tar.gz

nsight/Dockerfile

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,21 @@ LABEL maintainer="Bernd Doser <[email protected]>"
66
RUN apt-get update \
77
&& apt-get install -y --no-install-recommends \
88
firefox \
9-
libgtk2.0-0 \
10-
&& apt-get clean \
11-
&& rm -rf /var/lib/apt/lists/*
9+
libgtk2.0-0
1210

1311
RUN if [ $(grep DISTRIB_RELEASE=16.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
1412
apt-get install -y --no-install-recommends \
15-
openjdk-8-jdk \
16-
&& apt-get clean \
17-
&& rm -rf /var/lib/apt/lists/* \
13+
openjdk-8-jdk; \
1814
fi
1915

2016
RUN if [ $(grep DISTRIB_RELEASE=18.04 /etc/lsb-release | wc -l) -eq 1 ]; then \
2117
apt-get install -y --no-install-recommends \
22-
openjdk-11-jdk \
23-
&& apt-get clean \
24-
&& rm -rf /var/lib/apt/lists/* \
18+
openjdk-11-jdk; \
2519
fi
2620

21+
RUN apt-get clean \
22+
&& rm -rf /var/lib/apt/lists/*
23+
2724
# Install plugins
2825
ADD install_plugins.py plugins.yml /config/
2926
RUN /config/install_plugins.py -p /config/plugins.yml

0 commit comments

Comments
 (0)