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 anothrNick/github-tag-action from 1.46.0 to 1.61.0 #30

Merged
merged 3 commits into from
Jan 9, 2023
Merged

Bump anothrNick/github-tag-action from 1.46.0 to 1.61.0 #30

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cec8338
DP-860 : align cicd and dockerfiles (#15)
AlexFernandes-MOVAI Sep 26, 2022
481589e
Bump anothrNick/github-tag-action from 1.46.0 to 1.61.0
dependabot[bot] Jan 9, 2023
74d5cf2
Merge branch 'dev' into dependabot/github_actions/anothrNick/github-t…
AlexFernandes-MOVAI Jan 9, 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
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
with:
fetch-depth: '0'
- name: Bump version and push tag
uses: anothrNick/github-tag-action@1.39.0
uses: anothrNick/github-tag-action@1.61.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WITH_V: true
Expand Down
25 changes: 21 additions & 4 deletions .github/workflows/docker-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,48 @@ on:
types: [released]
jobs:
ros-tools-melodic:
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
with:
docker_file: melodic/Dockerfile
docker_image: devops/ros-tools-melodic
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 }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
ros-tools-noetic:
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
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 }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
ros-tools-ce:
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
with:
docker_file: ce/Dockerfile
docker_image: devops/ros-tools-ce
github_ref: ${{ github.ref }}
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 }}
snyk_token: ${{ secrets.SNYK_TOKEN }}
6 changes: 3 additions & 3 deletions ce/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This Dockerfile is used to build an rviz image based on Ubuntu
ARG DOCKER_REGISTRY="registry.aws.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/devops/movai-base-focal:v1.2.0
ARG DOCKER_REGISTRY="pubregistry.aws.cloud.mov.ai"
FROM ${DOCKER_REGISTRY}/ce/movai-base-focal:v1.4.11

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
LABEL maintainer="devops@mov.ai"
LABEL movai="ros-tools"
LABEL environment="develop"

Expand Down
2 changes: 1 addition & 1 deletion files/ubuntu/install/tigervnc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
set -e

echo "Install TigerVNC server"
wget -qO- https://deac-ams.dl.sourceforge.net/project/tigervnc/stable/1.8.0/tigervnc-1.8.0.x86_64.tar.gz | tar xz --strip 1 -C /
wget -qO- https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/tigervnc-1.12.0.x86_64.tar.gz/download | tar xz --strip 1 -C /
2 changes: 1 addition & 1 deletion melodic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
FROM osrf/ros:melodic-desktop-full

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
LABEL maintainer="devops@mov.ai"
LABEL movai="ros-tools"
LABEL environment="develop"

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
Expand Up @@ -3,7 +3,7 @@
FROM osrf/ros:noetic-desktop-full

LABEL description="MOV.AI Graphical Tools"
LABEL maintainer="devop@mov.ai"
LABEL maintainer="devops@mov.ai"
LABEL movai="ros-tools"
LABEL environment="develop"

Expand Down