buildmaster: provide OpenWrt version in About section

So it's clear to anyone which version is actually deployed.

Signed-off-by: Petr Štetiar <ynezz@true.cz>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b7214c2e902c1cf5736e99ef63103e68cfad0e7..b8d197479d699d21e0832fb3d7192f4ade155420 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 variables:
   BUILDBOT_VERSION: 3.0.2
+  OPENWRT_VERSION: $CI_COMMIT_SHORT_SHA
 
 include:
   - local: .gitlab/docker.yml

diff --git a/.gitlab/docker.yml b/.gitlab/docker.yml
index 752cca9d3acdef679d1305275e1f140d7d5d3304..4c4fc8faa6906da68631d00edc36b0c3dd00974b 100644 (file)
--- a/.gitlab/docker.yml
+++ b/.gitlab/docker.yml
@@ -17,7 +17,7 @@
   script:
     - export IMAGE_NAME="$(echo $CI_JOB_NAME | sed 's/build Docker image \(.*\)/\1/')"
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - docker build --build-arg BUILDBOT_VERSION=$BUILDBOT_VERSION -t "$IMAGE_NAME" -f "docker/$IMAGE_NAME/Dockerfile" .
+    - docker build --build-arg BUILDBOT_VERSION=$BUILDBOT_VERSION --build-arg OPENWRT_VERSION=$OPENWRT_VERSION -t "$IMAGE_NAME" -f "docker/$IMAGE_NAME/Dockerfile" .
     - docker tag "$IMAGE_NAME" "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
     - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME-$BUILDBOT_VERSION:$CI_COMMIT_REF_SLUG"
 

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 6ddc99da1e56f008e15d3c811fe8c98f6c9d9efb..28dc9ed63aeaec6b8a4da92c95105685a3d69e97 100644 (file)
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -3,6 +3,7 @@ MAINTAINER  OpenWrt Maintainers
 
 ARG         DEBIAN_FRONTEND=noninteractive
 ARG         BUILDBOT_VERSION=2.10.1
+ARG         OPENWRT_VERSION=unknown
 
 ENV         BUILDMASTER_CONFIG config.ini
 ENV         BUILDMASTER_PHASE  1
@@ -41,6 +42,11 @@ RUN \
        's/Welcome to buildbot/Welcome to OpenWrt buildbot/' \
        /usr/local/lib/python*/dist-packages/buildbot_www/static/scripts.js
 
+RUN \
+       sed -i \
+       "s;\"col-sm-12\"><ul><li ng-repeat;\"col-sm-12\"><ul><li>OpenWrt version: <a href=\"https://git.openwrt.org/$OPENWRT_VERSION\">$OPENWRT_VERSION</a></li><li ng-repeat;" \
+       /usr/local/lib/python*/dist-packages/buildbot_www/static/scripts.js
+
 ENV LANG=en_US.utf8
 
 COPY docker/buildmaster/files/entry.sh /entry.sh