Merge branch 'release_21.09' into release_22.01

.k8s_ci.Dockerfile

@@ -176,6 +176,10 @@ COPY --chown=$GALAXY_USER:$GALAXY_USER --from=server_build $ROOT_DIR .
 COPY --chown=$GALAXY_USER:$GALAXY_USER --from=client_build $SERVER_DIR/static ./server/static
 
 WORKDIR $SERVER_DIR
+
+# The data in version.json will be displayed in Galaxy's /api/version endpoint
+RUN printf "{\n  \"git_commit\": \"$(cat GITREVISION)\",\n  \"build_date\": \"$BUILD_DATE\",\n  \"image_tag\": \"$IMAGE_TAG\"\n}\n" > version.json
+
 EXPOSE 8080
 USER $GALAXY_USER