Skip to content

Commit bbd59b2

Browse files
authored
Explicitly use the x86_64 arch in certain Molecule scenarios (#659)
Explicitly specify the `x86_64` platform in certain Molecule scenarios to avoid compatibility issues in ARM based computers.
1 parent 464084f commit bbd59b2

File tree

13 files changed

+72
-71
lines changed

13 files changed

+72
-71
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CI/CD:
1313

1414
- Reimplement some platforms in the upgrade & downgrade Molecule scenarios since all platforms now have at least two releases.
1515
- Replace the hardcoded NGINX version check in multiple Molecule scenarios with a dynamic NGINX version check.
16+
- Explicitly specify the `x86_64` platform in certain Molecule scenarios to avoid compatibility issues in ARM based computers.
1617

1718
## 0.24.1 (July 6, 2023)
1819

molecule/default/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms:
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms:
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms:
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms:
8888
command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -113,7 +113,7 @@ platforms:
113113
command: /usr/sbin/init
114114
- name: rhel-7
115115
image: registry.access.redhat.com/ubi7:7.9
116-
# platform: x86_64
116+
platform: x86_64
117117
dockerfile: ../common/Dockerfile.j2
118118
privileged: true
119119
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms:
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host

molecule/distribution/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
8888
command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host
@@ -165,7 +165,7 @@ platforms: # The RHEL UBI 7 image fails to install some NGINX dependencies when
165165
command: /usr/sbin/init
166166
- name: ubuntu-bionic
167167
image: ubuntu:bionic
168-
# platform: x86_64
168+
platform: x86_64
169169
dockerfile: ../common/Dockerfile.j2
170170
privileged: true
171171
cgroupns_mode: host

molecule/downgrade-plus/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
5454
# command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
8888
# command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -113,7 +113,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
113113
command: /usr/sbin/init
114114
- name: rhel-7
115115
image: registry.access.redhat.com/ubi7:7.9
116-
# platform: x86_64
116+
platform: x86_64
117117
dockerfile: ../common/Dockerfile.j2
118118
privileged: true
119119
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms: # Alpine 3.18 and Debian bookworm only have one version of NGINX Plus
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host

molecule/downgrade/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms:
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms:
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms:
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms:
8888
command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -113,7 +113,7 @@ platforms:
113113
command: /usr/sbin/init
114114
- name: rhel-7
115115
image: registry.access.redhat.com/ubi7:7.9
116-
# platform: x86_64
116+
platform: x86_64
117117
dockerfile: ../common/Dockerfile.j2
118118
privileged: true
119119
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms:
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host

molecule/plus/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms:
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms:
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms:
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms:
8888
command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -113,7 +113,7 @@ platforms:
113113
command: /usr/sbin/init
114114
- name: rhel-7
115115
image: registry.access.redhat.com/ubi7:7.9
116-
# platform: x86_64
116+
platform: x86_64
117117
dockerfile: ../common/Dockerfile.j2
118118
privileged: true
119119
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms:
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host

molecule/source/molecule.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -104,7 +104,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
104104
command: /usr/sbin/init
105105
- name: rhel-7
106106
image: registry.access.redhat.com/ubi7:7.9
107-
# platform: x86_64
107+
platform: x86_64
108108
dockerfile: ../common/Dockerfile.j2
109109
privileged: true
110110
cgroupns_mode: host
@@ -147,7 +147,7 @@ platforms: # Oracle Linux 7 works in local tests but bugs out in GitHub actions
147147
command: /usr/sbin/init
148148
- name: sles15
149149
image: registry.suse.com/bci/bci-base:15.4
150-
# platform: x86_64
150+
platform: x86_64
151151
dockerfile: ../common/Dockerfile.j2
152152
privileged: true
153153
cgroupns_mode: host

molecule/stable/molecule.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ platforms:
2828
command: /sbin/init
2929
- name: alpine-3.16
3030
image: alpine:3.16
31-
# platform: x86_64
31+
platform: x86_64
3232
dockerfile: ../common/Dockerfile.j2
3333
privileged: true
3434
cgroupns_mode: host
@@ -54,7 +54,7 @@ platforms:
5454
command: /sbin/init
5555
- name: amazonlinux-2
5656
image: amazonlinux:2
57-
# platform: x86_64
57+
platform: x86_64
5858
dockerfile: ../common/Dockerfile.j2
5959
privileged: true
6060
cgroupns_mode: host
@@ -63,7 +63,7 @@ platforms:
6363
command: /usr/sbin/init
6464
- name: centos-7
6565
image: centos:7
66-
# platform: x86_64
66+
platform: x86_64
6767
dockerfile: ../common/Dockerfile.j2
6868
privileged: true
6969
cgroupns_mode: host
@@ -88,7 +88,7 @@ platforms:
8888
command: /sbin/init
8989
- name: oraclelinux-7
9090
image: oraclelinux:7
91-
# platform: x86_64
91+
platform: x86_64
9292
dockerfile: ../common/Dockerfile.j2
9393
privileged: true
9494
cgroupns_mode: host
@@ -113,7 +113,7 @@ platforms:
113113
command: /usr/sbin/init
114114
- name: rhel-7
115115
image: registry.access.redhat.com/ubi7:7.9
116-
# platform: x86_64
116+
platform: x86_64
117117
dockerfile: ../common/Dockerfile.j2
118118
privileged: true
119119
cgroupns_mode: host
@@ -156,7 +156,7 @@ platforms:
156156
command: /usr/sbin/init
157157
- name: sles15
158158
image: registry.suse.com/bci/bci-base:15.4
159-
# platform: x86_64
159+
platform: x86_64
160160
dockerfile: ../common/Dockerfile.j2
161161
privileged: true
162162
cgroupns_mode: host

0 commit comments

Comments
 (0)