Skip to content

Commit 07ca8cd

Browse files
committed
Docker: Test the matching of versions between source and container.
* Also add Dockerfile to some verifications in checklines.sh. * In DNF installations, move the package "time" from reinstall to install.
1 parent c233129 commit 07ca8cd

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ RUN dnf reinstall -y \
4848
gawk \
4949
grep \
5050
sed \
51-
time \
5251
&& \
5352
dnf clean all
5453

@@ -66,6 +65,7 @@ RUN dnf install -y \
6665
less \
6766
make \
6867
man-db \
68+
time \
6969
&& \
7070
dnf clean all
7171

docker/docker_bashrc.sh

+9
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,12 @@ $(uname -a)
2727
Type 'man Lazuli' to read the documentation.
2828
2929
EOF
30+
31+
if [ "$(cat /~/workspace/VERSION)" != "$(cat /etc/lazuli-version)" ]; then
32+
printf "WARNING! You are using the container in version %s whereas your \
33+
sources are in version %s\n" $(cat /etc/lazuli-version) \
34+
$(cat /~/workspace/VERSION);
35+
36+
printf "It is recommended that you pull and run the container in version \
37+
%s\n\n" $(cat /~/workspace/VERSION);
38+
fi

scripts/checklines.sh

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ grep -nrH \
2323
--include=*.S \
2424
--include=*.sh \
2525
--include=*.txt \
26+
--include=Dockerfile \
2627
--exclude-dir=build \
2728
--exclude-dir=LICENSES \
2829
--exclude-dir=_build > $tmp

0 commit comments

Comments
 (0)