From dd4fc69e7c25b9b964ef9424e265d82d1f5867bc Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Thu, 25 Jun 2020 10:39:26 +0100
Subject: [PATCH] Revert "Remove hard-coded shell info to use the docker
 ENTRYPOINT instead"

This reverts commit a052c71aec1fcf17ee8da22166ed6258877fb94d.
---
 cibuildwheel/docker_container.py | 7 +++++--
 cibuildwheel/linux.py            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cibuildwheel/docker_container.py b/cibuildwheel/docker_container.py
index a3609890..cef31d57 100644
--- a/cibuildwheel/docker_container.py
+++ b/cibuildwheel/docker_container.py
@@ -26,11 +26,13 @@ class DockerContainer:
     bash_stdin: IO[str]
     bash_stdout: IO[str]
 
-    def __init__(self, docker_image: str):
+    def __init__(self, docker_image: str, simulate_32_bit=False):
         self.docker_image = docker_image
+        self.simulate_32_bit = simulate_32_bit
 
     def __enter__(self) -> 'DockerContainer':
         self.container_name = f'cibuildwheel-{uuid.uuid4()}'
+        shell_args = ['linux32', '/bin/bash'] if self.simulate_32_bit else ['/bin/bash']
         subprocess.run(
             [
                 'docker', 'create',
@@ -38,7 +40,8 @@ class DockerContainer:
                 '--name', self.container_name,
                 '-i',
                 '-v', '/:/host',  # ignored on CircleCI
-                self.docker_image
+                self.docker_image,
+                *shell_args
             ],
             check=True,
         )
diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
index 529e1e5b..30481008 100644
--- a/cibuildwheel/linux.py
+++ b/cibuildwheel/linux.py
@@ -110,7 +110,7 @@ def build(options: BuildOptions) -> None:
             continue
 
         try:
-            with DockerContainer(docker_image) as docker:
+            with DockerContainer(docker_image, simulate_32_bit=platform_tag.endswith('i686')) as docker:
                 docker.copy_into(Path.cwd(), Path('/project'))
 
                 if options.before_all: