Skip to content

Commit

Permalink
Try using GitHub's Container registry
Browse files Browse the repository at this point in the history
  • Loading branch information
ruffsl committed Jun 14, 2021
1 parent 9fe6bf5 commit a0f4bc8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ _commands:
colcon clean packages --yes \
--packages-select ${TEST_PACKAGES} \
--base-select test_result
--base-select test_result
. install/setup.sh
set -o xtrace
Expand Down Expand Up @@ -302,7 +302,7 @@ _steps:
echo $CACHE_NONCE | \
(echo cache_nonce && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt
TZ=utc stat -c '%y' /ros_entrypoint.sh | \
(echo ros_entrypoint && cat) >> lockfile.txt
sha256sum $PWD/lockfile.txt >> lockfile.txt
Expand Down Expand Up @@ -436,15 +436,15 @@ _environments:
executors:
debug_exec:
docker:
- image: rosplanning/navigation2:main
- image: ghcr.io/ros-planning/navigation2:main
working_directory: /opt/overlay_ws
environment:
<<: *common_environment
CACHE_NONCE: "Debug"
OVERLAY_MIXINS: "debug ccache coverage-gcc"
release_exec:
docker:
- image: rosplanning/navigation2:main
- image: ghcr.io/ros-planning/navigation2:main
working_directory: /opt/overlay_ws
environment:
<<: *common_environment
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/update_ci_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
trigger: ${{ steps.check.outputs.trigger }}
no_cache: ${{ steps.check.outputs.no_cache }}
container:
image: rosplanning/navigation2:main
image: ghcr.io/ros-planning/navigation2:main
steps:
- name: "Check apt updates"
id: check
Expand Down Expand Up @@ -64,8 +64,9 @@ jobs:
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Set build config
id: config
run: |
Expand Down Expand Up @@ -95,11 +96,11 @@ jobs:
pull: true
push: true
no-cache: ${{ steps.config.outputs.no_cache }}
cache-from: type=registry,ref=rosplanning/navigation2:main
cache-from: type=registry,ref=ghcr.io/ros-planning/navigation2:main
cache-to: type=inline
target: builder
tags: |
rosplanning/navigation2:main
rosplanning/navigation2:main-${{ steps.config.outputs.timestamp }}
ghcr.io/ros-planning/navigation2:main
ghcr.io/ros-planning/navigation2:main-${{ steps.config.outputs.timestamp }}
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

0 comments on commit a0f4bc8

Please sign in to comment.