From 0e0fb0c1ef9a006db7f979f74947e3657efdd359 Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Sun, 14 Feb 2021 13:35:16 -0500 Subject: [PATCH] Cleaned up the formatting on the dockerfile and renamed it. --- Dockerfile | 54 +++++++++++++++++++++++++++++++++++++++++++++- README.md | 3 +++ docker-compose.yml | 7 +++--- 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 README.md diff --git a/Dockerfile b/Dockerfile index 1c380bc..a4a6b7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,59 @@ FROM ubuntu:20.04 + +LABEL maintainer="Jeffrey Phillips Freeman the@jeffreyfreeman.me" + ARG DEBIAN_FRONTEND=noninteractive + COPY sources.list /etc/apt/ -RUN set -ex && dpkg --add-architecture i386 && apt-get update -y && apt-get upgrade -y && dpkg --add-architecture armhf && dpkg --add-architecture arm64 && apt-get update -y && apt-get -y install build-essential zip unzip mingw-w64-tools mingw-w64 automake autoconf pkg-config m4 libtool openjdk-8-jre openjdk-8-jdk wget make git gcc-multilib g++-multilib pkg-config-aarch64-linux-gnu pkg-config-arm-linux-gnueabihf ocl-icd-opencl-dev:i386 ocl-icd-opencl-dev opencl-headers linux-libc-dev:i386 --no-install-recommends && apt-get -y install maven gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu binutils-arm-linux-gnueabihf g++-multilib-arm-linux-gnueabihf gcc-multilib-arm-linux-gnueabihf --no-install-recommends && apt-get clean && mkdir -p ~/msys2-OpenCL-headers && cd ~/msys2-OpenCL-headers && wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && tar xvJf mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && mkdir -p ~/openjdk/windows64 && cd ~/openjdk/windows64 && wget https://builds.openlogic.com/downloadJDK/openlogic-openjdk/8u272-b10/openlogic-openjdk-8u272-b10-windows-x64.zip + +RUN set -ex && \ + dpkg --add-architecture i386 && \ + apt-get update -y && \ + apt-get upgrade -y && \ + dpkg --add-architecture armhf && \ + dpkg --add-architecture arm64 && \ + apt-get update -y && \ + apt-get upgrade -y && \ + apt-get -y install --no-install-recommends build-essential \ + zip \ + unzip \ + mingw-w64-tools \ + mingw-w64 \ + automake \ + autoconf \ + pkg-config \ + m4 \ + libtool \ + openjdk-8-jre \ + openjdk-8-jdk \ + wget \ + make \ + git \ + gcc-multilib \ + g++-multilib \ + pkg-config-aarch64-linux-gnu \ + pkg-config-arm-linux-gnueabihf \ + ocl-icd-opencl-dev:i386 \ + ocl-icd-opencl-dev \ + opencl-headers \ + linux-libc-dev:i386 && \ + apt-get -y install --no-install-recommends maven \ + gcc-aarch64-linux-gnu \ + g++-aarch64-linux-gnu \ + binutils-aarch64-linux-gnu \ + binutils-arm-linux-gnueabihf \ + g++-multilib-arm-linux-gnueabihf \ + gcc-multilib-arm-linux-gnueabihf && \ + apt-get clean + +RUN mkdir -p ~/msys2-OpenCL-headers && \ + cd ~/msys2-OpenCL-headers && \ + wget https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && \ + tar xvJf mingw-w64-x86_64-opencl-headers-2~2.2.20200327-1-any.pkg.tar.xz && \ + mkdir -p ~/openjdk/windows64 && \ + cd ~/openjdk/windows64 && \ + wget https://builds.openlogic.com/downloadJDK/openlogic-openjdk/8u272-b10/openlogic-openjdk-8u272-b10-windows-x64.zip + COPY OpenCL_DLL /root/OpenCL_DLL/ COPY OpenCL_ARM /root/OpenCL_ARM/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..1240b5b --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +docker-compose run --rm opencl-cross-compiler +docker-compose build +docker-compose push diff --git a/docker-compose.yml b/docker-compose.yml index cb5aad3..f8fb5fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,7 @@ version: '3' services: - aparapi_native_builder: - container_name: aparapi_native_builder - image: 'aparapi/aparapi-native-builder-image' + opencl-cross-compiler: + container_name: opencl-cross-compiler + image: 'aparapi/opencl-cross-compiler' build: context: . -#docker-compose run --rm aparapi_native_builder #to interact in a shell -- GitLab