Skip to content

Commit

Permalink
DP-1104 - update service settings using ghcr (#229)
Browse files Browse the repository at this point in the history
* Update redis image registry to GHCR

* Update haproxy image registry to GHCR

* Update ros-master image registry to GHCR

* Update ros-tools image registry to GHCR

* Update backend image registry to GHCR

* Update spawner image registry to GHCR

* çast version of flow-initiator

* fix CICD container version

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: OttoMation-Movai <alex.fernandes@mov.ai>
  • Loading branch information
3 people authored Jul 31, 2023
1 parent 63f5fe8 commit 47c8160
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/TestOnPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
runs-on: ubuntu-20.04
needs: [ Lint-Project ]
container:
image: registry.cloud.mov.ai/qa/ros-buildtools-noetic:v2.0.3
image: registry.cloud.mov.ai/qa/ros-buildtools-noetic:v2.0.7
options: --user root
credentials:
username: ${{secrets.PORTUS_APP_USER}}
Expand All @@ -173,7 +173,7 @@ jobs:
run: |
PACKAGE_VERSION=$(dpkg-parsechangelog --show-field Version)
PACKAGE_NAME=$(dpkg-parsechangelog --show-field Source)
echo ::set-output name=pkg_name::$PACKAGE_NAME
echo ::set-output name=pkg_version::$PACKAGE_VERSION
Expand Down
14 changes: 7 additions & 7 deletions docker-compose-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ x-movai-common:

services:
redis-master:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/redis2:v1.0.11
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/redis2:v1.0.12
container_name: redis-master-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand All @@ -117,7 +117,7 @@ services:
<<: *movai-common-extra-hosts

redis-local:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/redis2:v1.0.11
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/redis2:v1.0.12
container_name: redis-local-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand All @@ -141,7 +141,7 @@ services:

backend:
<<: *movai-common
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/backend-noetic:2.4.1.35
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/backend-noetic:2.4.1.37
container_name: backend-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down Expand Up @@ -169,7 +169,7 @@ services:
<<: *movai-common-extra-hosts

ros-master:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ros-master-noetic:v2.4.2
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ros-master-noetic:v2.4.3
privileged: true
network_mode: host
depends_on:
Expand All @@ -193,7 +193,7 @@ services:

spawner:
<<: *movai-common
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/flow-initiator-noetic:2.4.1.36
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/flow-initiator-noetic:2.4.1.39
privileged: true
network_mode: host
depends_on:
Expand Down Expand Up @@ -231,7 +231,7 @@ services:
<<: *movai-common-extra-hosts

simulator:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ignition-gazebo:v2.4.2
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ignition-gazebo:v2.4.2
container_name: simulator-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down Expand Up @@ -267,7 +267,7 @@ services:
<<: *movai-common-extra-hosts

ros-tools:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ros-tools-ce:v2.4.6
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ros-tools-ce:v2.4.7
container_name: ros-tools-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down
16 changes: 8 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ x-movai-common:

services:
redis-master:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/redis2:v1.0.11
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/redis2:v1.0.12
container_name: redis-master-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand All @@ -110,7 +110,7 @@ services:
restart: unless-stopped

redis-local:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/redis2:v1.0.11
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/redis2:v1.0.12
container_name: redis-local-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand All @@ -135,7 +135,7 @@ services:

backend:
<<: *movai-common
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/backend-noetic:2.4.1.35
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/backend-noetic:2.4.1.37
container_name: backend-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand All @@ -162,7 +162,7 @@ services:
restart: unless-stopped

ros-master:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ros-master-noetic:v2.4.2
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ros-master-noetic:v2.4.3
privileged: true
networks:
- private
Expand All @@ -185,7 +185,7 @@ services:

spawner:
<<: *movai-common
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/flow-initiator-noetic:2.4.1.36
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/flow-initiator-noetic:2.4.1.39
privileged: true
networks:
- private
Expand Down Expand Up @@ -221,7 +221,7 @@ services:
restart: unless-stopped

simulator:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ignition-gazebo:v2.4.2
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ignition-gazebo:v2.4.2
container_name: simulator-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down Expand Up @@ -255,7 +255,7 @@ services:
command: ign gui -s $STUDIO_SIMU_GUI

ros-tools:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/ros-tools-ce:v2.4.6
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/ros-tools-ce:v2.4.7
container_name: ros-tools-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down Expand Up @@ -283,7 +283,7 @@ services:
exec /usr/bin/rviz
haproxy:
image: ${MOVAI_REGISTRY:-pubregistry.aws.cloud.mov.ai}/ce/haproxy:v1.0.10
image: ${MOVAI_REGISTRY:-ghcr.io/mov-ai}/ce/haproxy:v2.4.16
container_name: haproxy-$MOVAI_DEVICE_NAME
logging:
driver: "journald"
Expand Down

0 comments on commit 47c8160

Please sign in to comment.