Skip to content

Commit ff0110c

Browse files
committed
let docker decide the arch of images. remove amd64/arm64 symlinks
1 parent 1b5c2cc commit ff0110c

40 files changed

+2
-131
lines changed

BUILDING-PACKAGES.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ cp builder-support/dockerfiles/Dockerfile.target.debian-buster builder-support/d
5151

5252
In the new `builder-support/dockerfiles/Dockerfile.target.debian-bookworm` file, replace every occurence of `debian-buster` by `debian-bookworm`, and of `debian:buster` by `debian:bookworm`
5353

54-
Create symbolic links for the amd64 and arm64 versions:
55-
```
56-
ln -s builder-support/dockerfiles/Dockerfile.target.debian-bookworm builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64
57-
ln -s builder-support/dockerfiles/Dockerfile.target.debian-bookworm builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64
58-
```
59-
6054
Then add the new target to the list of OSes in the `.github/workflows/builder-dispatch.yml` workflow file:
6155
```
6256
default: >-

builder-support/dockerfiles/Dockerfile.target.centos-7

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33

44
# This defines the distribution base layer
55
# Put only the bare minimum of common commands here, without dev tools
6-
@IF [ ${BUILDER_TARGET} = centos-7 -o ${BUILDER_TARGET} = el-7 ]
76
FROM centos:7 as dist-base
8-
@ENDIF
9-
@IF [ ${BUILDER_TARGET} = centos-7-amd64 -o ${BUILDER_TARGET} = el-7-amd64]
10-
FROM amd64/centos:7 as dist-base
11-
@ENDIF
127

138
ARG BUILDER_CACHE_BUSTER=
149
RUN touch /var/lib/rpm/* && yum install -y epel-release centos-release-scl-rh

builder-support/dockerfiles/Dockerfile.target.centos-7-amd64

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder-support/dockerfiles/Dockerfile.target.centos-8

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ FROM centos:8 as dist-base
99
@IF [ ${BUILDER_TARGET} = centos-8-stream ]
1010
FROM quay.io/centos/centos:stream8 as dist-base
1111
@ENDIF
12-
@IF [ ${BUILDER_TARGET} = centos-8-amd64 ]
13-
FROM amd64/centos:8 as dist-base
14-
@ENDIF
15-
@IF [ ${BUILDER_TARGET} = centos-8-arm64 ]
16-
FROM arm64v8/centos:8 as dist-base
17-
@ENDIF
1812

1913
ARG BUILDER_CACHE_BUSTER=
2014

builder-support/dockerfiles/Dockerfile.target.centos-8-amd64

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder-support/dockerfiles/Dockerfile.target.centos-8-arm64

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder-support/dockerfiles/Dockerfile.target.debian-bookworm

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
# First do the source builds
22
@INCLUDE Dockerfile.target.sdist
33

4-
@IF [ ${BUILDER_TARGET} = debian-bookworm ]
54
FROM debian:bookworm as dist-base
6-
@ENDIF
7-
@IF [ ${BUILDER_TARGET} = debian-bookworm-amd64 ]
8-
FROM amd64/debian:bookworm as dist-base
9-
@ENDIF
10-
@IF [ ${BUILDER_TARGET} = debian-bookworm-arm64 ]
11-
FROM arm64v8/debian:bookworm as dist-base
12-
@ENDIF
135

146
ARG BUILDER_CACHE_BUSTER=
157
ARG APT_URL

builder-support/dockerfiles/Dockerfile.target.debian-bookworm-amd64

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder-support/dockerfiles/Dockerfile.target.debian-bookworm-arm64

Lines changed: 0 additions & 1 deletion
This file was deleted.

builder-support/dockerfiles/Dockerfile.target.debian-bullseye

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
# First do the source builds
22
@INCLUDE Dockerfile.target.sdist
33

4-
@IF [ ${BUILDER_TARGET} = debian-bullseye ]
54
FROM debian:bullseye as dist-base
6-
@ENDIF
7-
@IF [ ${BUILDER_TARGET} = debian-bullseye-amd64 ]
8-
FROM amd64/debian:bullseye as dist-base
9-
@ENDIF
10-
@IF [ ${BUILDER_TARGET} = debian-bullseye-arm64 ]
11-
FROM arm64v8/debian:bullseye as dist-base
12-
@ENDIF
135

146
ARG BUILDER_CACHE_BUSTER=
157
ARG APT_URL

0 commit comments

Comments
 (0)