From ac189a1d979bf6fa6af732b99acbb72842a70ca9 Mon Sep 17 00:00:00 2001 From: Elijah Shaw-Rutschman Date: Sat, 5 Sep 2020 14:57:23 -0500 Subject: [PATCH 1/3] Fix containerName to prevent clashes --- src/run-on-arch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/run-on-arch.js b/src/run-on-arch.js index 037750ae..973e751c 100644 --- a/src/run-on-arch.js +++ b/src/run-on-arch.js @@ -81,7 +81,7 @@ async function main() { } // Generate a container name slug unique to this arch/distro combo - const containerName = `run-on-arch-${slug(arch)}-${slug(distro)}`; + const containerName = `run-on-arch-${slug(env.GITHUB_REPOSITORY)}-${slug(arch)}-${slug(distro)}`; console.log('Configuring Docker for multi-architecture support') await exec( From edc24fb63aeddde2197b0ce0b634c63e108f0805 Mon Sep 17 00:00:00 2001 From: Elijah Shaw-Rutschman Date: Sat, 5 Sep 2020 15:06:43 -0500 Subject: [PATCH 2/3] Bump to v2.0.1 --- Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 | 10 ++++++++++ README.md | 4 ++-- package.json | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 diff --git a/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 b/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 new file mode 100644 index 00000000..bc5d82c8 --- /dev/null +++ b/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 @@ -0,0 +1,10 @@ +# Dockerfile for the host container +FROM ubuntu:bionic + +RUN \ + sudo apt-get update -y && \ + sudo apt-get install -y qemu qemu-user-static && \ + sudo apt-get clean && \ + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + +ENTRYPOINT /bin/bash diff --git a/README.md b/README.md index a534f495..181fcd52 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ jobs: name: Build on ubuntu-18.04 armv7 steps: - uses: actions/checkout@v2.1.0 - - uses: uraimo/run-on-arch-action@v2.0.0 + - uses: uraimo/run-on-arch-action@v2.0.1 name: Run commands id: runcmd with: @@ -84,7 +84,7 @@ jobs: steps: - uses: actions/checkout@v2.1.0 - - uses: uraimo/run-on-arch-action@v2.0.0 + - uses: uraimo/run-on-arch-action@v2.0.1 name: Build artifact id: build with: diff --git a/package.json b/package.json index 012626e1..c1c8df91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "run-on-arch", - "version": "2.0.0", + "version": "2.0.1", "description": "Multi architecture support for GitHub Actions", "author": "Umberto Raimondi, Elijah Shaw-Rutschman", "license": "BSD-3-Clause", From f0dc20ae414b36df371b09bb17dcdc74cdc86c6f Mon Sep 17 00:00:00 2001 From: Elijah Shaw-Rutschman Date: Sat, 5 Sep 2020 15:11:01 -0500 Subject: [PATCH 3/3] Remove dockerfile from other WIP stuff --- Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 diff --git a/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 b/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 deleted file mode 100644 index bc5d82c8..00000000 --- a/Dockerfiles/Dockerfile.host.x86_64.ubuntu18.04 +++ /dev/null @@ -1,10 +0,0 @@ -# Dockerfile for the host container -FROM ubuntu:bionic - -RUN \ - sudo apt-get update -y && \ - sudo apt-get install -y qemu qemu-user-static && \ - sudo apt-get clean && \ - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - -ENTRYPOINT /bin/bash