So it's clear to anyone which version is actually deployed.
Signed-off-by: Petr Štetiar <ynezz@true.cz>
variables:
BUILDBOT_VERSION: 3.0.2
+ OPENWRT_VERSION: $CI_COMMIT_SHORT_SHA
include:
- local: .gitlab/docker.yml
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"
ARG DEBIAN_FRONTEND=noninteractive
ARG BUILDBOT_VERSION=2.10.1
+ARG OPENWRT_VERSION=unknown
ENV BUILDMASTER_CONFIG config.ini
ENV BUILDMASTER_PHASE 1
'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