Skip to content

Commit

Permalink
Add i686 support
Browse files Browse the repository at this point in the history
  • Loading branch information
lalten committed Aug 29, 2023
1 parent 3796fc4 commit 53bd4d9
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
distro: archarm_latest
- arch: aarch64
distro: fedora_latest
- arch: i686
distro: ubuntu18.04
- arch: ppc64le
distro: alpine_latest
- arch: x86_64
Expand Down
5 changes: 5 additions & 0 deletions Dockerfiles/Dockerfile.i686.alpine_latest
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
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
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
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
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", "--"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM amd64/fedora:latest
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", "--"]
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM amd64/ubuntu:22.04
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
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", "--"]
5 changes: 3 additions & 2 deletions README.md
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`, `ppc64le`, or `x86_64`. 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,10 +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 |
| 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
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, x86_64."
description: "CPU architecture: armv6, armv7, aarch64, i686, riscv64, s390x, ppc64le, x86_64."
required: false
default: "aarch64"
distro:
Expand Down

0 comments on commit 53bd4d9

Please sign in to comment.