Skip to content

Commit

Permalink
[RELEASE] 4.6.0-RC.RELEASE
Browse files Browse the repository at this point in the history
Signed-off-by: vlo-rte <[email protected]>
  • Loading branch information
vlo-rte authored and freddidierRTE committed Jan 10, 2025
1 parent b0b2c9e commit d1f523e
Show file tree
Hide file tree
Showing 10 changed files with 129 additions and 129 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SNAPSHOT
4.6.0-RC.RELEASE
6 changes: 3 additions & 3 deletions cli/opfabDockerCli.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright (c) 2024, RTE (http://www.rte-france.com)
# Copyright (c) 2024-2025, RTE (http://www.rte-france.com)
# See AUTHORS.txt
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -11,7 +11,7 @@

CONFIG_FILE=$1
if [[ ! -f "$CONFIG_FILE" ]]; then
docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it lfeoperatorfabric/of-opfab-cli:SNAPSHOT
docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it lfeoperatorfabric/of-opfab-cli:4.6.0-RC.RELEASE
exit
fi

Expand All @@ -38,4 +38,4 @@ while IFS= read -r line; do
done < "$CONFIG_FILE"

# Run the Docker command with the selected configuration
docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it -e ENV_NAME="$ENV_NAME" -e OPFAB_URL="$OPFAB_URL" -e OPFAB_PORT="$OPFAB_PORT" -e OPFAB_LOGIN="$OPFAB_LOGIN" -e OPFAB_PASSWORD="$OPFAB_PASSWORD" lfeoperatorfabric/of-opfab-cli:SNAPSHOT
docker run -v "$(pwd)":/opfab/host -u "$(id -u):$(id -g)" -it -e ENV_NAME="$ENV_NAME" -e OPFAB_URL="$OPFAB_URL" -e OPFAB_PORT="$OPFAB_PORT" -e OPFAB_LOGIN="$OPFAB_LOGIN" -e OPFAB_PASSWORD="$OPFAB_PASSWORD" lfeoperatorfabric/of-opfab-cli:4.6.0-RC.RELEASE
2 changes: 1 addition & 1 deletion cli/src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opfab-cli",
"version": "SNAPSHOT",
"version": "4.6.0-RC.RELEASE",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
6 changes: 3 additions & 3 deletions config/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2.1'
services:
rabbitmq:
container_name: rabbit
image: "lfeoperatorfabric/of-rabbitmq:SNAPSHOT"
image: "lfeoperatorfabric/of-rabbitmq:4.6.0-RC.RELEASE"
ports:
- "5672:5672"
- "15672:15672"
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
mem_limit: 1g
web-ui:
container_name: web-ui
image: "lfeoperatorfabric/of-web-ui:SNAPSHOT"
image: "lfeoperatorfabric/of-web-ui:4.6.0-RC.RELEASE"
ports:
- "2002:80"
volumes:
Expand All @@ -49,7 +49,7 @@ services:
- "./nginx.conf:/etc/nginx/conf.d/default.conf"
ext-app:
container_name: external-app
image: "lfeoperatorfabric/of-external-app:SNAPSHOT"
image: "lfeoperatorfabric/of-external-app:4.6.0-RC.RELEASE"
ports:
- "8090:8090"
volumes:
Expand Down
26 changes: 13 additions & 13 deletions config/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- "./mongodump:/dump"
rabbitmq:
container_name: rabbit
image: "lfeoperatorfabric/of-rabbitmq:SNAPSHOT"
image: "lfeoperatorfabric/of-rabbitmq:4.6.0-RC.RELEASE"
hostname: rabbit


Expand Down Expand Up @@ -79,7 +79,7 @@ services:
ALLOW_PLAINTEXT_LISTENER: "yes"
users:
container_name: users
image: "lfeoperatorfabric/of-users-service:SNAPSHOT"
image: "lfeoperatorfabric/of-users-service:4.6.0-RC.RELEASE"
depends_on:
- mongodb
- rabbitmq
Expand All @@ -95,7 +95,7 @@ services:
- ${CONFIG_PATH}:/external-config
businessconfig:
container_name: businessconfig
image: "lfeoperatorfabric/of-businessconfig-service:SNAPSHOT"
image: "lfeoperatorfabric/of-businessconfig-service:4.6.0-RC.RELEASE"
depends_on:
- mongodb
user: ${USER_ID}:${USER_GID}
Expand All @@ -111,7 +111,7 @@ services:
- ${CONFIG_PATH}:/external-config
cards-publication:
container_name: cards-publication
image: "lfeoperatorfabric/of-cards-publication-service:SNAPSHOT"
image: "lfeoperatorfabric/of-cards-publication-service:4.6.0-RC.RELEASE"
depends_on:
- mongodb
- rabbitmq
Expand All @@ -127,7 +127,7 @@ services:
- ${CONFIG_PATH}:/external-config
cards-consultation:
container_name: cards-consultation
image: "lfeoperatorfabric/of-cards-consultation-service:SNAPSHOT"
image: "lfeoperatorfabric/of-cards-consultation-service:4.6.0-RC.RELEASE"
depends_on:
- mongodb
- rabbitmq
Expand All @@ -144,7 +144,7 @@ services:
- ${CONFIG_PATH}:/external-config
web-ui:
container_name: web-ui
image: "lfeoperatorfabric/of-web-ui:SNAPSHOT"
image: "lfeoperatorfabric/of-web-ui:4.6.0-RC.RELEASE"
ports:
- "2002:80"
depends_on:
Expand All @@ -158,7 +158,7 @@ services:
- "../../src/test/externalWebAppExample:/usr/share/nginx/html/external/appExample"
cards-external-diffusion:
container_name: cards-external-diffusion
image: "lfeoperatorfabric/of-cards-external-diffusion-service:SNAPSHOT"
image: "lfeoperatorfabric/of-cards-external-diffusion-service:4.6.0-RC.RELEASE"
depends_on:
- cards-consultation
- users
Expand All @@ -173,7 +173,7 @@ services:
- "./common.yml:/usr/app/config/common.yml"
cards-reminder:
container_name: cards-reminder
image: "lfeoperatorfabric/of-cards-reminder:SNAPSHOT"
image: "lfeoperatorfabric/of-cards-reminder:4.6.0-RC.RELEASE"
depends_on:
- cards-publication
- users
Expand All @@ -188,7 +188,7 @@ services:
- "./common.yml:/usr/app/config/common.yml"
supervisor:
container_name: supervisor
image: "lfeoperatorfabric/of-supervisor:SNAPSHOT"
image: "lfeoperatorfabric/of-supervisor:4.6.0-RC.RELEASE"
depends_on:
- cards-publication
- users
Expand All @@ -205,7 +205,7 @@ services:
# - "./custom-sounds:/usr/share/nginx/html/assets/sounds"
external-devices:
container_name: external-devices
image: "lfeoperatorfabric/of-external-devices-service:SNAPSHOT"
image: "lfeoperatorfabric/of-external-devices-service:4.6.0-RC.RELEASE"
depends_on:
- mongodb
- users
Expand All @@ -224,7 +224,7 @@ services:
# External application example
ext-app:
container_name: external-app
image: "lfeoperatorfabric/of-external-app:SNAPSHOT"
image: "lfeoperatorfabric/of-external-app:4.6.0-RC.RELEASE"
ports:
- "8090:8090"
volumes:
Expand All @@ -234,7 +234,7 @@ services:
# Dummy external devices using Modbus Protocol
dummy-modbus-device_1:
container_name: dummy-modbus-device_1
image: "lfeoperatorfabric/of-dummy-modbus-device:SNAPSHOT"
image: "lfeoperatorfabric/of-dummy-modbus-device:4.6.0-RC.RELEASE"
user: ${USER_ID}:${USER_GID}
ports:
- "4031:4030"
Expand All @@ -243,7 +243,7 @@ services:
- ${CONFIG_PATH}:/external-config
dummy-modbus-device_2:
container_name: dummy-modbus-device_2
image: "lfeoperatorfabric/of-dummy-modbus-device:SNAPSHOT"
image: "lfeoperatorfabric/of-dummy-modbus-device:4.6.0-RC.RELEASE"
user: ${USER_ID}:${USER_GID}
ports:
- "4032:4030"
Expand Down
2 changes: 1 addition & 1 deletion services/businessconfig/src/main/modeling/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only.
version: SNAPSHOT
version: 4.6.0-RC.RELEASE
title: BusinessConfig Management
termsOfService: ''
contact:
Expand Down
2 changes: 1 addition & 1 deletion services/cards-publication/src/main/modeling/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only.
version: SNAPSHOT
version: 4.6.0-RC.RELEASE
title: Card Management API
termsOfService: ''
contact:
Expand Down
2 changes: 1 addition & 1 deletion services/external-devices/src/main/modeling/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only.
version: SNAPSHOT
version: 4.6.0-RC.RELEASE
title: External Devices Management
termsOfService: ''
contact:
Expand Down
2 changes: 1 addition & 1 deletion services/users/src/main/modeling/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
swagger: '2.0'
info:
description: IMPORTANT - The Try it Out button will generate curl requests for examples, but executing them through the UI will not work as authentication has not been set up. This page is for documentation only.
version: SNAPSHOT
version: 4.6.0-RC.RELEASE
title: User Management
termsOfService: ''
contact:
Expand Down
Loading

0 comments on commit d1f523e

Please sign in to comment.