From e547abab28f16fd33c23f935e045b650c871747b Mon Sep 17 00:00:00 2001 From: Thomas Van Iseghem Date: Tue, 23 May 2023 19:16:37 +0200 Subject: Updated the large development environment --- CorOS-dev-environment/CorOS-build-env/Dockerfile | 31 +++++++++++++++ .../CorOS-build-env/docker-compose.yaml | 21 ++++++++++ QC-dev-environment/Dockerfile | 46 ---------------------- QC-dev-environment/docker-compose.yaml | 21 ---------- 4 files changed, 52 insertions(+), 67 deletions(-) create mode 100644 CorOS-dev-environment/CorOS-build-env/Dockerfile create mode 100644 CorOS-dev-environment/CorOS-build-env/docker-compose.yaml delete mode 100644 QC-dev-environment/Dockerfile delete mode 100644 QC-dev-environment/docker-compose.yaml diff --git a/CorOS-dev-environment/CorOS-build-env/Dockerfile b/CorOS-dev-environment/CorOS-build-env/Dockerfile new file mode 100644 index 0000000..9ddd439 --- /dev/null +++ b/CorOS-dev-environment/CorOS-build-env/Dockerfile @@ -0,0 +1,31 @@ +# Use official Ubuntu as our base# Use official Ubuntu as our base +FROM opencortex/coros-emu:latest + +# Add required packages in the noninteractive mode +RUN apt-get -y update && apt-get -y -q install curl net-tools build-essential minicom tftpd-hpa git-all subversion openssh-server ncurses-dev php gawk g++ m4 libncurses5-dev texinfo flex bison php-cli vim php-xml python-setuptools python-dev make unzip rsync cpio bc lib32z1 lib32stdc++6 + +# Set the workspace in /sc5xx_dev +ARG TOOLCHAIN_PATH=/sc5xx_dev +RUN mkdir -p ${TOOLCHAIN_PATH} + +# Set the path and name of Patch in /sc5xx_dev/linuxaddin-dockerfile/lib +ARG PATCH_PATH=${TOOLCHAIN_PATH}/lib +ARG PATCH=${PATCH_PATH}/0002-port-to-perl-5.22-and-later.patch + +# Set the Version and Path of cces-linux-add-in. +ARG LINUX_ADDIN_VERSION="1.3.1" + +# Working directory set to /sc5xx_dev +WORKDIR ${TOOLCHAIN_PATH} + +# Copy the install_toolchain.sh to /sc5xx_dev +COPY install_toolchain.sh . +RUN dos2unix install_toolchain.sh && chmod +x install_toolchain.sh && ./install_toolchain.sh ${TOOLCHAIN_PATH} + +# Set toolchain PATH for remote container +ENV PATH=${PATH}:/opt/analog/cces-linux-add-in/${LINUX_ADDIN_VERSION}/ARM/arm-linux-gnueabi/bin/ +ENV QEMU_LD_PREFIX="/opt/analog/cces-linux-add-in/1.3.1/ARM/arm-linux-gnueabi/sysroot" + +WORKDIR / + +ENTRYPOINT ["/bin/bash"] diff --git a/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml b/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml new file mode 100644 index 0000000..6abd5da --- /dev/null +++ b/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml @@ -0,0 +1,21 @@ +# Docker compose file for easy volume mounting and running of the container + +services: + coros-dev: + image: opencortex/coros-dev:latest + build: + context: ../ + dockerfile: CorOS-build-env/Dockerfile + tags: + - opencortex/coros-dev:latest + + volumes: + - ../filesystems:/qc-fs + - ../mount:/mnt + + environment: + # Edit this to your needs. This should be just the file name, not the path. + - UPDATE_FILE=verify.bin.gz + + privileged: true + entrypoint: /bin/bash -c "while true; do sleep 1; done" \ No newline at end of file diff --git a/QC-dev-environment/Dockerfile b/QC-dev-environment/Dockerfile deleted file mode 100644 index e6da7c5..0000000 --- a/QC-dev-environment/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# Use official Ubuntu as our base# Use official Ubuntu as our base -FROM ubuntu:18.04 as builder - -# Add required packages in the noninteractive mode -RUN apt-get -y update -RUN DEBIAN_FRONTEND=noninteractive apt-get -y -q install curl dos2unix net-tools build-essential minicom tftpd-hpa git-all subversion openssh-server ncurses-dev php gawk g++ m4 libncurses5-dev texinfo flex bison php-cli vim php-xml python-setuptools python-dev make unzip rsync cpio bc lib32z1 lib32stdc++6 qemu qemu-user-static - -# Set the workspace in /sc5xx_dev -ARG TOOLCHAIN_PATH=/sc5xx_dev -RUN mkdir -p ${TOOLCHAIN_PATH} - -# Set the path and name of Patch in /sc5xx_dev/linuxaddin-dockerfile/lib -ARG PATCH_PATH=${TOOLCHAIN_PATH}/lib -ARG PATCH=${PATCH_PATH}/0002-port-to-perl-5.22-and-later.patch - -# Set the Version and Path of cces-linux-add-in. -ARG LINUX_ADDIN_VERSION="1.3.1" - -# Working directory set to /sc5xx_dev -WORKDIR ${TOOLCHAIN_PATH} - -# Copy the install_toolchain.sh to /sc5xx_dev -COPY install_toolchain.sh . -RUN dos2unix install_toolchain.sh -RUN chmod +x install_toolchain.sh -RUN ./install_toolchain.sh ${TOOLCHAIN_PATH} - -# # Set toolchain PATH for remote container -ENV PATH=${PATH}:/opt/analog/cces-linux-add-in/${LINUX_ADDIN_VERSION}/ARM/arm-linux-gnueabi/bin/ -ENV QEMU_LD_PREFIX="/opt/analog/cces-linux-add-in/1.3.1/ARM/arm-linux-gnueabi/sysroot" - -# Mounting the QC-rootfs -RUN mkdir /qc-fs -RUN mkdir /qc-fs-uncompressed - -RUN mkdir -p /qt_src -WORKDIR /qt_src -# # Copy and run the installer -COPY qt-compiled-4.8.7.tar.gz . -COPY install_qt_compiled.sh . - -WORKDIR / -COPY init_system.sh . -COPY update-builder.sh . - -ENTRYPOINT ["/bin/bash"] diff --git a/QC-dev-environment/docker-compose.yaml b/QC-dev-environment/docker-compose.yaml deleted file mode 100644 index 44f870e..0000000 --- a/QC-dev-environment/docker-compose.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Docker compose file for easy volume mounting and running of the container - -services: - cortex-dev: - image: cortex-dev:latest - build: - context: . - dockerfile: Dockerfile - tags: - - cortex-dev:latest - - volumes: - - ./filesystems:/qc-fs - - ./mount:/mnt - - environment: - # Edit this to your needs. This should be just the file name, not the path. - - UPDATE_FILE=verify.bin.gz - - privileged: true - entrypoint: /bin/bash -c "while true; do sleep 1; done" \ No newline at end of file -- cgit v1.2.3