From 080ef2ffa51cbd18d49ed85f58be69514cb6234c Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Mon, 26 Sep 2022 16:24:14 +0100 Subject: [PATCH 1/4] align cicd and dockerfiles --- .github/workflows/bump-version.yml | 2 +- .github/workflows/docker-ci.yml | 29 +++++++++++++++++++++++++---- ce/Dockerfile | 6 +++--- melodic/Dockerfile | 2 +- noetic/Dockerfile | 2 +- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index 7c2cca1..e7e0d0c 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -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.46.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} WITH_V: true diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 7586393..bb7d326 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -18,31 +18,52 @@ 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 }} + pub_registry_user: ${{ secrets.PORTUS_APP_USER }} + pub_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 }} + pub_registry_user: ${{ secrets.PORTUS_APP_USER }} + pub_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 }} diff --git a/ce/Dockerfile b/ce/Dockerfile index b22c176..600a1d4 100644 --- a/ce/Dockerfile +++ b/ce/Dockerfile @@ -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" diff --git a/melodic/Dockerfile b/melodic/Dockerfile index 45b79b1..0ada8ac 100644 --- a/melodic/Dockerfile +++ b/melodic/Dockerfile @@ -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" diff --git a/noetic/Dockerfile b/noetic/Dockerfile index cacdf49..9235ab5 100644 --- a/noetic/Dockerfile +++ b/noetic/Dockerfile @@ -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" From fe176528f31de831efbb82937719c5d49dd67a8c Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Mon, 26 Sep 2022 16:26:11 +0100 Subject: [PATCH 2/4] clean secrets --- .github/workflows/docker-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index bb7d326..b96ae65 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -30,8 +30,6 @@ jobs: 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 }} ros-tools-noetic: uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1 @@ -46,8 +44,6 @@ jobs: 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 }} ros-tools-ce: uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1 From 0c11efac673df5509bfdc2066dcb8432a62fd2a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 17:09:13 +0100 Subject: [PATCH 3/4] Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0 (#14) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.46.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](https://github.com/anothrNick/github-tag-action/compare/1.39.0...1.46.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> From ab2b1dbb10bd86379f2d808a18c3f1b36c46bb1b Mon Sep 17 00:00:00 2001 From: Alex Fernandes Date: Mon, 26 Sep 2022 17:30:52 +0100 Subject: [PATCH 4/4] fix tigervnc install --- files/ubuntu/install/tigervnc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/ubuntu/install/tigervnc.sh b/files/ubuntu/install/tigervnc.sh index e240475..1a1848e 100644 --- a/files/ubuntu/install/tigervnc.sh +++ b/files/ubuntu/install/tigervnc.sh @@ -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 /