Skip to content

Commit

Permalink
Begin updating.
Browse files Browse the repository at this point in the history
  • Loading branch information
bluescarni committed Jul 5, 2024
1 parent c2b09ba commit f482a38
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
docker-username: DOCKERHUB_USERNAME
docker-password: DOCKERHUB_TOKEN
- docker/build:
dockerfile: Dockerfile2014
dockerfile: Dockerfile
extra_build_args: --build-arg ARCH=aarch64
image: $DOCKERHUB_USERNAME/llvm_manylinux2014_aarch64
tag: latest
Expand Down
34 changes: 30 additions & 4 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
-
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
-
name: Login to Docker Hub
uses: docker/login-action@v2
Expand All @@ -26,11 +26,37 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile2014
file: ./Dockerfile
platforms: linux/amd64
push: true
# This section is not necessary as this is the default in the Dockerfile,
# Added to be explicit
build-args: |
ARCH=x86_64
MANYLINUXIMG=manylinux2014
tags: ${{ secrets.DOCKERHUB_USERNAME }}/llvm_manylinux2014_x86_64:latest
manylinux_2_28_x86_64:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Build and push amd64
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile
platforms: linux/amd64
push: true
build-args: |
ARCH=x86_64
MANYLINUXIMG=manylinux_2_28
tags: ${{ secrets.DOCKERHUB_USERNAME }}/llvm_manylinux_2_28_x86_64:latest
2 changes: 1 addition & 1 deletion Dockerfile2014 → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG ARCH=x86_64
FROM quay.io/pypa/manylinux2014_$ARCH
FROM quay.io/pypa/$MANYLINUXIMG_$ARCH

# We place ourself in some safe location to do all installations
RUN cd \
Expand Down

0 comments on commit f482a38

Please sign in to comment.