From 8fc2c4c9b44310c204ff13d88b811d4a02313de4 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Sat, 21 Sep 2024 04:47:47 -0700 Subject: [PATCH] util-docker: Remove 'BUILDPLATFORM' set This actually breaks multi-platform builds when using docker buildx via the docker-bake.hcl file. Removing this fixes and permits the multi-platform builds to be built. --- util/dockerfiles/clang-compiler/Dockerfile | 2 +- util/dockerfiles/gcc-compiler/Dockerfile | 2 +- util/dockerfiles/gcn-gpu/Dockerfile | 2 +- util/dockerfiles/gpu-fs/Dockerfile | 2 +- util/dockerfiles/sst/Dockerfile | 2 +- util/dockerfiles/systemc/Dockerfile | 2 +- util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-24.04_all-dependencies/Dockerfile | 2 +- util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/util/dockerfiles/clang-compiler/Dockerfile b/util/dockerfiles/clang-compiler/Dockerfile index 052507ca23..88d44643f2 100644 --- a/util/dockerfiles/clang-compiler/Dockerfile +++ b/util/dockerfiles/clang-compiler/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest +FROM ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile to build an Ubuntu 24.04 docker image with all dependencies for gem5, with Clang 16." diff --git a/util/dockerfiles/gcc-compiler/Dockerfile b/util/dockerfiles/gcc-compiler/Dockerfile index ca3ba2124e..9b7a62d989 100644 --- a/util/dockerfiles/gcc-compiler/Dockerfile +++ b/util/dockerfiles/gcc-compiler/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${BUILDPLATFORM} ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest +FROM ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile to build an Ubuntu 24.04 docker image with all dependencies for gem5, with GCC 13." diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile index 5f5237c4d8..cb2ee188f3 100644 --- a/util/dockerfiles/gcn-gpu/Dockerfile +++ b/util/dockerfiles/gcn-gpu/Dockerfile @@ -24,7 +24,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ubuntu:20.04 +FROM ubuntu:20.04 LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="This dockerfile contains all the dependences necessary to run GPU applications in gem5 using the gcn5 (Vega) APU model." diff --git a/util/dockerfiles/gpu-fs/Dockerfile b/util/dockerfiles/gpu-fs/Dockerfile index 558d8cd062..b7d39df79a 100644 --- a/util/dockerfiles/gpu-fs/Dockerfile +++ b/util/dockerfiles/gpu-fs/Dockerfile @@ -27,7 +27,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ubuntu:22.04 +FROM ubuntu:22.04 LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="The Dockerfile in this directory is used to build applications to be run with GPU full system. Applications targeting AMD's ROCm GPU framework can be built using this docker (e.g., HIP, HSA, OpenCL, etc.)." diff --git a/util/dockerfiles/sst/Dockerfile b/util/dockerfiles/sst/Dockerfile index 8c7e051d69..cba94520ca 100644 --- a/util/dockerfiles/sst/Dockerfile +++ b/util/dockerfiles/sst/Dockerfile @@ -23,7 +23,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest +FROM ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile for using SST with gem5." diff --git a/util/dockerfiles/systemc/Dockerfile b/util/dockerfiles/systemc/Dockerfile index 9a703beef1..e5beb240db 100644 --- a/util/dockerfiles/systemc/Dockerfile +++ b/util/dockerfiles/systemc/Dockerfile @@ -23,7 +23,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest +FROM ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile for using SystemC with gem5." LABEL org.opencontainers.image.licenses=BSD-3-Clause diff --git a/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile index f5abe97073..f49a761084 100644 --- a/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile @@ -23,7 +23,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ubuntu:22.04 +FROM ubuntu:22.04 LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile to build an Ubuntu 22.04 docker image with all dependencies required for building and using gem5." diff --git a/util/dockerfiles/ubuntu-24.04_all-dependencies/Dockerfile b/util/dockerfiles/ubuntu-24.04_all-dependencies/Dockerfile index 58829a7f64..dec66f8ab6 100644 --- a/util/dockerfiles/ubuntu-24.04_all-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-24.04_all-dependencies/Dockerfile @@ -23,7 +23,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ubuntu:24.04 +FROM ubuntu:24.04 LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile to build an Ubuntu 24.04 docker image with all dependencies required for building and using gem5." diff --git a/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile index f75a99ff24..08ed9694ac 100644 --- a/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile +++ b/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile @@ -23,7 +23,7 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FROM --platform=${BUILDPLATFORM} ubuntu:24.04 +FROM ubuntu:24.04 LABEL org.opencontainers.image.source=https://github.com/gem5/gem5 LABEL org.opencontainers.image.description="A Dockerfile to build an Ubuntu 24.04 docker image with minimal dependencies required for building and using gem5."