Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 16-trains-with-no-changing-on-file-system
  • 18-predefined-selectable-option-as-an-environment-variable-value
  • 19-error-failed-to-parse-json-when-result-to-big
  • 19-error-failed-to-parse-json-when-result-to-big-2
  • 20-handling-the-telegraf-metrics-on-the-station-software-not-in-the-metadata-generator
  • 25-retrieving-the-station-pid-from-the-initial-env-file-and-setting-it-automatically-at-the
  • 39-add-anonymisation-feature-to-station-software
  • 40-allow-different-base-url-for-web-view
  • 41-update-packages
  • 43-streamlining-deployment
  • 48-adding-gpu-support-installation-to-the-install-script
  • 52-autofill-bind-mount
  • 8-vault-health-status
  • 88-poll-logs-only-if-running
  • 9-error-stdout-maxbuffer-length-exceeded
  • 93-vault-initialization-unsealing-error-in-station-software
  • api-for-keycloak-migration
  • cleaned-publishable-branch
  • cosign-integration
  • decouple-station-builds
  • edc-integration
  • enable-gzip-for-fl-results
  • error-tar-bad-archive
  • federated
  • federatedmerge
  • federatedmerge-backup
  • git-ci-test
  • interopt
  • job-automation-agent
  • keycloak-auth
  • main
  • main-fairds
  • prerelease
  • prerelease-semver
  • protect-routes-with-keycloak
  • redacted
  • renovate-axios-1.x-lockfile
  • renovate-diff2html-3.x-lockfile
  • renovate-eslint-8.x-lockfile
  • renovate-express-fileupload-1.x-lockfile
  • renovate-material-ui-popup-state-5.x-lockfile
  • renovate-mongo-4.x
  • renovate-mongoose-6.x-lockfile
  • renovate-nodemon-3.x-lockfile
  • renovate-reduxjs-toolkit-1.x-lockfile
  • renovate-semantic-release-monorepo
  • renovate/configure
  • replace-hardcoded-cs-path
  • set-sast-config-1
  • station-software-ui-update
  • v
  • v0.0.0
  • v1.0.0
  • v1.0.1
  • v1.0.5
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.0.4
60 results

Target

Select target project
  • padme-development/padme-station-software
1 result
Select Git revision
  • 16-trains-with-no-changing-on-file-system
  • 18-predefined-selectable-option-as-an-environment-variable-value
  • 19-error-failed-to-parse-json-when-result-to-big
  • 19-error-failed-to-parse-json-when-result-to-big-2
  • 20-handling-the-telegraf-metrics-on-the-station-software-not-in-the-metadata-generator
  • 25-retrieving-the-station-pid-from-the-initial-env-file-and-setting-it-automatically-at-the
  • 39-add-anonymisation-feature-to-station-software
  • 40-allow-different-base-url-for-web-view
  • 41-update-packages
  • 43-streamlining-deployment
  • 48-adding-gpu-support-installation-to-the-install-script
  • 52-autofill-bind-mount
  • 8-vault-health-status
  • 88-poll-logs-only-if-running
  • 9-error-stdout-maxbuffer-length-exceeded
  • 93-vault-initialization-unsealing-error-in-station-software
  • api-for-keycloak-migration
  • cleaned-publishable-branch
  • cosign-integration
  • decouple-station-builds
  • edc-integration
  • enable-gzip-for-fl-results
  • error-tar-bad-archive
  • federated
  • federatedmerge
  • federatedmerge-backup
  • git-ci-test
  • interopt
  • job-automation-agent
  • keycloak-auth
  • main
  • main-fairds
  • prerelease
  • prerelease-semver
  • protect-routes-with-keycloak
  • redacted
  • renovate-axios-1.x-lockfile
  • renovate-diff2html-3.x-lockfile
  • renovate-eslint-8.x-lockfile
  • renovate-express-fileupload-1.x-lockfile
  • renovate-material-ui-popup-state-5.x-lockfile
  • renovate-mongo-4.x
  • renovate-mongoose-6.x-lockfile
  • renovate-nodemon-3.x-lockfile
  • renovate-reduxjs-toolkit-1.x-lockfile
  • renovate-semantic-release-monorepo
  • renovate/configure
  • replace-hardcoded-cs-path
  • set-sast-config-1
  • station-software-ui-update
  • v
  • v0.0.0
  • v1.0.0
  • v1.0.1
  • v1.0.5
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.0.4
60 results
Show changes
Commits on Source (8)
stages:
- release 🚀
- build 📦
# - test
- fetch-version 🔎
- build 📦
- deploy 🚅
- release 🚀
.common_release_config:
image: node:18
......@@ -17,12 +16,17 @@ variables:
REGISTRY_DIND_IMAGE: $CI_REGISTRY_IMAGE/dind
REGISTRY_VAULT_IMAGE: $CI_REGISTRY_IMAGE/vault
release:
fetch_semantic_version:
extends: .common_release_config
stage: release 🚀
stage: fetch-version 🔎
dependencies: []
script:
- npx semantic-release
- echo "Fetching Station Software release version 🚧"
- npx semantic-release --dry-run
- echo "Release Version added to Artifacts ✅"
artifacts:
reports:
dotenv: variables.env
rules:
- if: $CI_COMMIT_BRANCH == "main"
......@@ -63,6 +67,7 @@ build_station_software:
before_script:
- apk update && apk add git
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
- '[ -n "$RELEASE_VERSION" ] && echo \{\"version\":\"$RELEASE_VERSION\"\} > version.json'
script:
- echo "Building Station Software 🚧"
- docker build --pull -t $REGISTRY_STATION_SOFTWARE_IMAGE:$CI_COMMIT_SHA -t $REGISTRY_STATION_SOFTWARE_IMAGE:$CI_COMMIT_REF_NAME .
......@@ -98,38 +103,6 @@ build_vault:
- docker push $REGISTRY_VAULT_IMAGE:$CI_COMMIT_SHA
- echo "build complete!"
### COMMENTING FOR NOW
### TEST COVERAGE CAN BE PRIORITIZED LATER
# test_station_software:
# image: node:16.2.0
# stage: test
# needs:
# - build_station_software
# script:
# - echo "Test station software!"
# - ls
# - npm install
# - npx jest --ci --reporters=default --reporters=jest-junit
# artifacts:
# when: always
# reports:
# junit:
# - junit.xml
fetch_semantic_version:
extends: .common_release_config
stage: fetch-version 🔎
dependencies: []
script:
- echo "Fetching Station Software release version 🚧"
- npx semantic-release --dry-run
- echo "Release Version added to Artifacts ✅"
artifacts:
reports:
dotenv: variables.env
rules:
- if: $CI_COMMIT_BRANCH == "main"
deploy_image_branch:
image: docker:23-dind
services:
......@@ -157,6 +130,34 @@ deploy_image_branch:
- docker push $HARBOR_VAULT_IMAGE:$CI_COMMIT_BRANCH
rules:
- if: $CI_COMMIT_BRANCH == "main"
release:
extends: .common_release_config
stage: release 🚀
dependencies: []
script:
- npx semantic-release
rules:
- if: $CI_COMMIT_BRANCH == "main"
### COMMENTING FOR NOW
### TEST COVERAGE CAN BE PRIORITIZED LATER
# test_station_software:
# image: node:16.2.0
# stage: test
# needs:
# - build_station_software
# script:
# - echo "Test station software!"
# - ls
# - npm install
# - npx jest --ci --reporters=default --reporters=jest-junit
# artifacts:
# when: always
# reports:
# junit:
# - junit.xml
# pages:
# image: ubuntu:latest
# stage: deploy
......
{
"name": "@padme-development/padme-station-software",
"version": "2.0.3",
"version": "2.0.4",
"description": "A Dockerized Javascript Web Application providing interfaces for Monitoring of the algorithms and components, which manage the business logic e.g. pulling a train, execute a train, inspect the results, and many more.",
"license": "MIT",
"homepage": "https://git.rwth-aachen.de/padme-development/padme-station-software",
......
......@@ -11,7 +11,6 @@ const { vault } = require("../utils");
const { utility } = require("../utils");
const { environment } = require("../utils");
const { verifyImage } = require("../utils/cosign");
const { version } = require("../package.json");
// Dashboard
// Get Docker Information
......@@ -258,9 +257,15 @@ function resolveVaultPathList(callback) {
module.exports = (keycloak) => {
router.get("/v2/stationInfo", (req, res) => {
res.send({
appVersion: version,
});
let appVersion;
try {
appVersion = require("../version.json").version;
} catch (error) {
console.log("Could not load station version from 'version.json'. Using package.json");
appVersion = require("../package.json").version;
}
res.send({ appVersion });
});
router.get("/v2/keycloakConfig", (req, res) => {
......