Skip to content

Commit 39b7ec9

Browse files
khos2owkhos2ow
authored
Extract environment information to separate script file (#14)
1 parent a62f9fc commit 39b7ec9

File tree

9 files changed

+165
-96
lines changed

9 files changed

+165
-96
lines changed

‎ubuntu1404/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,6 @@ VOLUME /mnt/build
5252
WORKDIR /mnt/build
5353

5454
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
55+
COPY environment-info.sh /usr/local/bin/environment-info.sh
56+
5557
ENTRYPOINT ["docker-entrypoint.sh"]

‎ubuntu1404/docker-entrypoint.sh‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,7 @@ else
136136
fi
137137

138138
# Print out some environment information
139-
echo -e "System information:"
140-
cat /etc/*-release
141-
142-
echo -e "\nGit version:"
143-
git --version
144-
145-
echo -e "\nJava version:"
146-
java -version
147-
148-
echo -e "\nMaven version:"
149-
mvn --version
150-
151-
echo -e "\nPython version:"
152-
python --version
153-
154-
echo -e "\ndpkg version:"
155-
dpkg --version
156-
157-
echo -e "\ndevscripts version:"
158-
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
159-
160-
echo -e "\ndebhelper version:"
161-
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
162-
163-
echo -e "\ngenisoimage version:"
164-
genisoimage --version
165-
166-
echo -e "\nlsb-release version:"
167-
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
168-
169-
echo -e "\nbuild-essential version:"
170-
dpkg -s build-essential | grep "Version:" | awk '{print $2}'
139+
environment-info.sh
171140

172141
echo -e "\n--------\n"
173142

‎ubuntu1404/environment-info.sh‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/bin/bash
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
set -e
20+
21+
echo -e "System information:"
22+
cat /etc/*-release
23+
24+
echo -e "\nGit version:"
25+
git --version
26+
27+
echo -e "\nJava version:"
28+
java -version
29+
30+
echo -e "\nMaven version:"
31+
mvn --version
32+
33+
echo -e "\nPython version:"
34+
python --version
35+
36+
echo -e "\ndpkg version:"
37+
dpkg --version
38+
39+
echo -e "\ndevscripts version:"
40+
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
41+
42+
echo -e "\ndebhelper version:"
43+
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
44+
45+
echo -e "\ngenisoimage version:"
46+
genisoimage --version
47+
48+
echo -e "\nlsb-release version:"
49+
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
50+
51+
echo -e "\nbuild-essential version:"
52+
dpkg -s build-essential | grep "Version:" | awk '{print $2}'

‎ubuntu1604/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ VOLUME /mnt/build
4747
WORKDIR /mnt/build
4848

4949
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
50+
COPY environment-info.sh /usr/local/bin/environment-info.sh
51+
5052
ENTRYPOINT ["docker-entrypoint.sh"]

‎ubuntu1604/docker-entrypoint.sh‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,7 @@ else
136136
fi
137137

138138
# Print out some environment information
139-
echo -e "System information:"
140-
cat /etc/*-release
141-
142-
echo -e "\nGit version:"
143-
git --version
144-
145-
echo -e "\nJava version:"
146-
java -version
147-
148-
echo -e "\nMaven version:"
149-
mvn --version
150-
151-
echo -e "\nPython version:"
152-
python --version
153-
154-
echo -e "\ndpkg version:"
155-
dpkg --version
156-
157-
echo -e "\ndevscripts version:"
158-
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
159-
160-
echo -e "\ndebhelper version:"
161-
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
162-
163-
echo -e "\ngenisoimage version:"
164-
genisoimage --version
165-
166-
echo -e "\nlsb-release version:"
167-
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
168-
169-
echo -e "\nbuild-essential version:"
170-
dpkg -s build-essential | grep "Version:" | awk '{print $2}'
139+
environment-info.sh
171140

172141
echo -e "\n--------\n"
173142

‎ubuntu1604/environment-info.sh‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/bin/bash
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
set -e
20+
21+
echo -e "System information:"
22+
cat /etc/*-release
23+
24+
echo -e "\nGit version:"
25+
git --version
26+
27+
echo -e "\nJava version:"
28+
java -version
29+
30+
echo -e "\nMaven version:"
31+
mvn --version
32+
33+
echo -e "\nPython version:"
34+
python --version
35+
36+
echo -e "\ndpkg version:"
37+
dpkg --version
38+
39+
echo -e "\ndevscripts version:"
40+
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
41+
42+
echo -e "\ndebhelper version:"
43+
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
44+
45+
echo -e "\ngenisoimage version:"
46+
genisoimage --version
47+
48+
echo -e "\nlsb-release version:"
49+
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
50+
51+
echo -e "\nbuild-essential version:"
52+
dpkg -s build-essential | grep "Version:" | awk '{print $2}'

‎ubuntu1804/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@ VOLUME /mnt/build
4747
WORKDIR /mnt/build
4848

4949
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
50+
COPY environment-info.sh /usr/local/bin/environment-info.sh
51+
5052
ENTRYPOINT ["docker-entrypoint.sh"]

‎ubuntu1804/docker-entrypoint.sh‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -136,38 +136,7 @@ else
136136
fi
137137

138138
# Print out some environment information
139-
echo -e "System information:"
140-
cat /etc/*-release
141-
142-
echo -e "\nGit version:"
143-
git --version
144-
145-
echo -e "\nJava version:"
146-
java -version
147-
148-
echo -e "\nMaven version:"
149-
mvn --version
150-
151-
echo -e "\nPython version:"
152-
python --version
153-
154-
echo -e "\ndpkg version:"
155-
dpkg --version
156-
157-
echo -e "\ndevscripts version:"
158-
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
159-
160-
echo -e "\ndebhelper version:"
161-
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
162-
163-
echo -e "\ngenisoimage version:"
164-
genisoimage --version
165-
166-
echo -e "\nlsb-release version:"
167-
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
168-
169-
echo -e "\nbuild-essential version:"
170-
dpkg -s build-essential | grep "Version:" | awk '{print $2}'
139+
environment-info.sh
171140

172141
echo -e "\n--------\n"
173142

‎ubuntu1804/environment-info.sh‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#!/bin/bash
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
19+
set -e
20+
21+
echo -e "System information:"
22+
cat /etc/*-release
23+
24+
echo -e "\nGit version:"
25+
git --version
26+
27+
echo -e "\nJava version:"
28+
java -version
29+
30+
echo -e "\nMaven version:"
31+
mvn --version
32+
33+
echo -e "\nPython version:"
34+
python --version
35+
36+
echo -e "\ndpkg version:"
37+
dpkg --version
38+
39+
echo -e "\ndevscripts version:"
40+
dpkg -s devscripts | grep "Version:" | awk '{print $2}'
41+
42+
echo -e "\ndebhelper version:"
43+
dpkg -s debhelper | grep "Version:" | awk '{print $2}'
44+
45+
echo -e "\ngenisoimage version:"
46+
genisoimage --version
47+
48+
echo -e "\nlsb-release version:"
49+
dpkg -s lsb-release | grep "Version:" | awk '{print $2}'
50+
51+
echo -e "\nbuild-essential version:"
52+
dpkg -s build-essential | grep "Version:" | awk '{print $2}'

0 commit comments

Comments
 (0)