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.

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

feat: Update base image #53

Merged
merged 11 commits into from
Jun 9, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
34 changes: 34 additions & 0 deletions .github/workflows/deploy-melodic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Publish to Registry (Melodic)
on:
push:
branches:
- master
paths:
- "melodic/**"
- ".github/workflows/deploy-melodic.yml"
schedule:
- cron: "7 4 * * 0" # Weekly on Sundays at 13:07 (JST)
workflow_dispatch:

env:
DOCKER_USERNAME: tiryoh
DOCKER_IMAGENAME: ros
GIT_CONFIG_USER: Tiryoh@GitHubActions
GIT_CONFIG_EMAIL: [email protected]

jobs:
build-and-deploy:
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- uses: Tiryoh/docker-ros2-desktop-vnc/.github/actions/deploy@master
with:
ros-distro: melodic
latest: false
gha-job-name: build-and-deploy
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
34 changes: 34 additions & 0 deletions .github/workflows/deploy-noetic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Publish to Registry (Noetic)
on:
push:
branches:
- master
paths:
- "noetic/**"
- ".github/workflows/deploy-noetic.yml"
schedule:
- cron: "7 4 * * 0" # Weekly on Sundays at 13:07 (JST)
workflow_dispatch:

env:
DOCKER_USERNAME: tiryoh
DOCKER_IMAGENAME: ros
GIT_CONFIG_USER: Tiryoh@GitHubActions
GIT_CONFIG_EMAIL: [email protected]

jobs:
build-and-deploy:
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- uses: Tiryoh/docker-ros2-desktop-vnc/.github/actions/deploy@master
with:
ros-distro: noetic
latest: false
gha-job-name: build-and-deploy
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
github-token: ${{ secrets.GITHUB_TOKEN }}
194 changes: 0 additions & 194 deletions .github/workflows/deploy.yml

This file was deleted.

33 changes: 33 additions & 0 deletions .github/workflows/test-melodic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and Test (Melodic)
on:
pull_request:
branches:
- master
paths:
- "melodic/**"
- ".github/workflows/test-melodic.yml"
schedule:
- cron: "0 2 * * 0" # Weekly on Sundays at 02:00
workflow_dispatch:

env:
DOCKER_USERNAME: tiryoh
DOCKER_IMAGENAME: ros

jobs:
build:
strategy:
fail-fast: false
matrix:
arch: [arm64, amd64]
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- uses: Tiryoh/docker-ros2-desktop-vnc/.github/actions/test@master
with:
ros-distro: melodic
arch: ${{ matrix.arch }}
33 changes: 33 additions & 0 deletions .github/workflows/test-noetic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and Test (Noetic)
on:
pull_request:
branches:
- master
paths:
- "noetic/**"
- ".github/workflows/test-noetic.yml"
schedule:
- cron: "0 2 * * 0" # Weekly on Sundays at 02:00
workflow_dispatch:

env:
DOCKER_USERNAME: tiryoh
DOCKER_IMAGENAME: ros

jobs:
build:
strategy:
fail-fast: false
matrix:
arch: [arm64, amd64]
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: true
- uses: Tiryoh/docker-ros2-desktop-vnc/.github/actions/test@master
with:
ros-distro: noetic
arch: ${{ matrix.arch }}
43 changes: 0 additions & 43 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Publish to Registry](https://github.com/Tiryoh/docker_ros-desktop-vnc/workflows/Publish%20to%20Registry/badge.svg?branch=master)](https://github.com/Tiryoh/docker-ros-desktop-vnc/actions?query=workflow%3A%22Publish+to+Registry%22+branch%3Amaster)
[![](https://img.shields.io/docker/pulls/tiryoh/ros-desktop-vnc.svg)](https://hub.docker.com/r/tiryoh/ros-desktop-vnc)

A Docker image to provide HTML5 VNC interface to access Ubuntu LXDE + ROS, based on [dorowu/ubuntu-desktop-lxde-vnc](https://github.com/fcwu/docker-ubuntu-vnc-desktop)
A Docker image to provide HTML5 VNC interface to access Ubuntu Desktop + ROS, based on [AtsushiSaito/docker-ubuntu-sweb](https://github.com/AtsushiSaito/docker-ubuntu-sweb)

ROS 2 version: https://github.com/Tiryoh/docker-ros2-desktop-vnc

Expand Down
Loading