Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump MOV-AI/.github from 1 to 2 #36

Merged
merged 9 commits into from
Jul 28, 2023
Merged

Bump MOV-AI/.github from 1 to 2 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e97f33
Bump MOV-AI/.github from 1 to 2
dependabot[bot] Feb 20, 2023
956e615
Merge main into dependabot/github_actions/MOV-AI/dot-github-2
github-actions[bot] Mar 29, 2023
f1a43c0
Merge main into dependabot/github_actions/MOV-AI/dot-github-2
github-actions[bot] Apr 6, 2023
cfff5ae
Merge main into dependabot/github_actions/MOV-AI/dot-github-2
github-actions[bot] May 12, 2023
c97da0d
Merge main into dependabot/github_actions/MOV-AI/dot-github-2
github-actions[bot] May 15, 2023
d77d24c
DP-1155 : no dependency on archive.ubuntu.com (#47)
AlexFernandes-MOVAI Jul 12, 2023
3d8b543
Merge main into dependabot/github_actions/MOV-AI/dot-github-2
github-actions[bot] Jul 12, 2023
87a85bc
Update base pipeline version
mariana-dias-alves Jul 28, 2023
dc3cad5
Merge branch 'dev' into dependabot/github_actions/MOV-AI/dot-github-2
AlexFernandes-MOVAI Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/docker-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,34 @@ on:
types: [released]
jobs:
ros-tools-noetic:
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
with:
docker_file: noetic/Dockerfile
docker_image: devops/ros-tools-noetic
github_ref: ${{ github.ref }}
deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
version: ${GITHUB_REF##*/}
push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
snyk_check: true
secrets:
registry_user: ${{ secrets.PORTUS_APP_USER }}
registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
ros-tools-ce:
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
with:
docker_file: ce/Dockerfile
docker_image: devops/ros-tools-ce
public: true
public_image: ce/ros-tools-ce
github_ref: ${{ github.ref }}
deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
version: ${GITHUB_REF##*/}
push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
snyk_check: true
secrets:
registry_user: ${{ secrets.PORTUS_APP_USER }}
registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Image is built in 3 flavours:

| Flavour | Base Image | Python |
| ------------ | ---------- | ------ |
| ros-tools-noetic | movai-base-focal:v2.4.0 | 3.8.10 |
| ros-tools-ce | movai-base-focal:v2.4.0 | 3.8.10 |
| ros-tools-noetic | movai-base-focal:v2.4.3 | 3.8.10 |
| ros-tools-ce | movai-base-focal:v2.4.3 | 3.8.10 |

## About

Expand Down
2 changes: 1 addition & 1 deletion ce/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used to build an rviz image based on Ubuntu
ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.2
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.3

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devops@mov.ai"
Expand Down
2 changes: 1 addition & 1 deletion noetic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Dockerfile is used to build an headless vnc image based on Ubuntu
ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.2
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v2.4.3

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devops@mov.ai"
Expand Down
Loading