Skip to content

Commit

Permalink
Use github hosted arm64 image builder (#395)
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea authored Oct 2, 2024
1 parent b73f692 commit 0ac92f7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
runs-on: ${{ matrix.builder }}
name: ${{ matrix.name }}
# uses same runner for image building, but devspace image builds faster
needs:
- devspaces
services:
registry:
image: registry:2
Expand All @@ -41,7 +39,8 @@ jobs:
- builder: devtools-multiarch-builder
platform: linux/amd64
name: amd64
- builder: devtools-arm64-runner
- builder: ubuntu-24.04-arm64-2core
# devtools-arm64-runner
platform: linux/arm64
name: arm64

Expand Down
6 changes: 4 additions & 2 deletions final/Containerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Builds community-ansible-dev-tools-container-base image which provides
# container-in-container support and all installs all binary dependencies
# cspell:ignore minrate,opencontainers,cffi,ruamel,subuid,subgid,workdir,chgrp,mountopt,microdnf,makecache,setcaps,pylibssh,chsh,nodev,overlayfs,libssh,markupsafe,additionalimage,USERNS
# cspell:ignore minrate,opencontainers,cffi,ruamel,subuid,subgid,workdir,chgrp,mountopt,microdnf,makecache,setcaps,pylibssh,chsh,nodev,overlayfs,libssh,markupsafe,additionalimage,USERNS,onigurumacffi
FROM community-ansible-dev-tools-base:latest

USER root
Expand Down Expand Up @@ -36,7 +36,7 @@ git \
nano \
vim \
dumb-init \
# ansible-pylibssh needs:
# ansible-pylibssh, onigurumacffi/arm64 needs:
gcc \
git-core \
libssh-devel \
Expand All @@ -46,6 +46,8 @@ ncurses \
oniguruma-devel \
python3-bcrypt \
python3-cffi \
# onigurumacffi/arm64 needs:
python3-devel \
python3-pip \
python3-pyyaml \
python3-ruamel-yaml \
Expand Down

0 comments on commit 0ac92f7

Please sign in to comment.