Skip to content

Commit 534cb81

Browse files
committed
Remove unused arch parameter in Dockerfile and update documentation to reflect it
1 parent f6bb2d5 commit 534cb81

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: actions/checkout@v2
1818
- name: Build LLVM ${{ matrix.llvm }} on ${{ matrix.ubuntu }}
1919
run: |
20-
docker build . -t docker.pkg.github.com/trailofbits/cxx-common/llvm${{ matrix.llvm }}-ubuntu${{ matrix.ubuntu }}-amd64:latest -f Dockerfile --build-arg UBUNTU_BASE=ubuntu:${{ matrix.ubuntu }} --build-arg arch=x86 --build-arg LLVM_VERSION=${{ matrix.llvm }}
20+
docker build . -t docker.pkg.github.com/trailofbits/cxx-common/llvm${{ matrix.llvm }}-ubuntu${{ matrix.ubuntu }}-amd64:latest -f Dockerfile --build-arg UBUNTU_BASE=ubuntu:${{ matrix.ubuntu }} --build-arg LLVM_VERSION=${{ matrix.llvm }}
2121
- name: Push Image for LLVM ${{ matrix.llvm }} on ${{ matrix.ubuntu }}
2222
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
2323
run: |

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
ARG LLVM_VERSION=800
2-
ARG arch=aarch64
32
ARG BOOTSTRAP=/opt/trailofbits/bootstrap
43
ARG LIBRARIES=/opt/trailofbits/libraries
54
ARG UBUNTU_BASE=arm64v8/ubuntu:18.04

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ docker pull docker.pkg.github.com/trailofbits/cxx-common/llvm800-ubuntu18.04-amd
3737

3838
## Building The Docker Image Yourself
3939

40-
The Dockerfile can be built locally. It is parameterized by LLVM version, OS release, and architecture. Some examples below:
40+
The Dockerfile can be built locally. It is parameterized by LLVM version and OS release. Currently same-architecture builds are expected (i.e., build amd64 images on amd64 and build aarch64 images on aarch64). Some examples below:
4141

4242
Building cxx-common for LLVM 8 on Ubuntu 18.04 on AArch64 (ARM v8 64-bit):
4343
```sh
44-
docker build . -t cxx-common:llvm800-ubuntu18.04-aarch64 -f Dockerfile --build-arg UBUNTU_BASE=arm64v8/ubuntu:18.04 --build-arg arch=aarch64 --build-arg LLVM_VERSION=800
44+
docker build . -t cxx-common:llvm800-ubuntu18.04-aarch64 -f Dockerfile --build-arg UBUNTU_BASE=arm64v8/ubuntu:18.04 --build-arg LLVM_VERSION=800
4545
```
4646

4747
Building cxx-common for LLVM 4.0.1 on Ubuntu 16.04 for AMD64 (x86-64):
4848
```sh
49-
docker build . -t cxx-common:llvm401-ubuntu16.04-amd64 -f Dockerfile --build-arg UBUNTU_BASE=ubuntu:16.04 --build-arg arch=x86 --build-arg LLVM_VERSION=401
49+
docker build . -t cxx-common:llvm401-ubuntu16.04-amd64 -f Dockerfile --build-arg UBUNTU_BASE=ubuntu:16.04 --build-arg LLVM_VERSION=401
5050
```
5151

5252
# Manual (non-Docker) Builds

0 commit comments

Comments
 (0)