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

Support x86_64 and i686 architectures #94

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support x86_64 and i686 architectures #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3796fc4
Support `x86_64` aka `amd64` arch
lalten Oct 1, 2022
53bd4d9
Add `i686` support
lalten Oct 1, 2022
ed48589
undo autoformatting changes
lalten Aug 29, 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
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ jobs:
distro: archarm_latest
- arch: aarch64
distro: fedora_latest
- arch: i686
distro: ubuntu18.04
- arch: ppc64le
distro: alpine_latest
- arch: x86_64
distro: ubuntu_latest
- arch: armv6
distro: buster
- arch: armv7
Expand Down
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.alpine_latest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/alpine:latest

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.bullseye
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/debian:bullseye

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.buster
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/debian:buster

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.jessie
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/debian:jessie

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.stretch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/debian:stretch

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.ubuntu16.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/ubuntu:16.04

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.ubuntu18.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/ubuntu:18.04

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.ubuntu_latest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM i386/ubuntu:latest

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
ENTRYPOINT ["linux32", "--"]
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.alpine_latest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/alpine:latest

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.bullseye
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/debian:bullseye

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.buster
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/debian:buster

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.jessie
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/debian:jessie

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.stretch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/debian:stretch

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu16.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:16.04

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu18.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:18.04

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu20.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:20.04

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu_devel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:devel

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu_latest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:latest

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 4 additions & 0 deletions Dockerfiles/Dockerfile.x86_64.ubuntu_rolling
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM amd64/ubuntu:rolling

COPY ./run-on-arch-install.sh /root/run-on-arch-install.sh
RUN chmod +x /root/run-on-arch-install.sh && /root/run-on-arch-install.sh
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ A GitHub Action that executes commands on non-x86 CPU architecture (armv6, armv7

This action requires three input parameters:

* `arch`: CPU architecture: `armv6`, `armv7`, `aarch64`, `riscv64`, `s390x`, or `ppc64le`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `arch`: CPU architecture: `armv6`, `armv7`, `aarch64`, `i686`, `riscv64`, `s390x`, `ppc64le`, or `x86_64`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `distro`: Linux distribution name: `ubuntu16.04`, `ubuntu18.04`, `ubuntu20.04`, `bullseye`, `buster`, `stretch`, `jessie`, `fedora_latest`, `alpine_latest` or `archarm_latest`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `run`: Shell commands to execute in the container.

Expand Down Expand Up @@ -155,9 +155,11 @@ This table details the valid `arch`/`distro` combinations:
| armv6 | jessie, stretch, buster, bullseye, alpine_latest |
| armv7 | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| aarch64 | stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| i686 | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu_latest, alpine_latest |
| riscv64 | ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, alpine_edge |
| s390x | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest |
| ppc64le | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04,ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest |
| x86_64 | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest |


Using an invalid `arch`/`distro` combination will fail.
Expand Down
2 changes: 1 addition & 1 deletion action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: 'Run commands in a Linux container with a specific CPU architecture
author: 'Umberto Raimondi, Elijah Shaw-Rutschman'
inputs:
arch:
description: 'CPU architecture: armv6, armv7, aarch64, riscv64, s390x, ppc64le.'
description: 'CPU architecture: armv6, armv7, aarch64, i686, riscv64, s390x, ppc64le, x86_64.'
required: false
default: 'aarch64'
distro:
Expand Down