diff options
| -rw-r--r-- | CorOS-dev-environment/CorOS-build-env/Dockerfile (renamed from QC-dev-environment/Dockerfile) | 23 | ||||
| -rw-r--r-- | CorOS-dev-environment/CorOS-build-env/docker-compose.yaml (renamed from QC-dev-environment/docker-compose.yaml) | 14 |
2 files changed, 11 insertions, 26 deletions
diff --git a/QC-dev-environment/Dockerfile b/CorOS-dev-environment/CorOS-build-env/Dockerfile index e6da7c5..9ddd439 100644 --- a/QC-dev-environment/Dockerfile +++ b/CorOS-dev-environment/CorOS-build-env/Dockerfile @@ -1,9 +1,8 @@ # Use official Ubuntu as our base# Use official Ubuntu as our base -FROM ubuntu:18.04 as builder +FROM opencortex/coros-emu:latest # 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 +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 @@ -21,26 +20,12 @@ 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} +RUN dos2unix install_toolchain.sh && chmod +x install_toolchain.sh && ./install_toolchain.sh ${TOOLCHAIN_PATH} -# # Set toolchain PATH for remote container +# 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/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml index 44f870e..6abd5da 100644 --- a/QC-dev-environment/docker-compose.yaml +++ b/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml @@ -1,17 +1,17 @@ # Docker compose file for easy volume mounting and running of the container services: - cortex-dev: - image: cortex-dev:latest + coros-dev: + image: opencortex/coros-dev:latest build: - context: . - dockerfile: Dockerfile + context: ../ + dockerfile: CorOS-build-env/Dockerfile tags: - - cortex-dev:latest + - opencortex/coros-dev:latest volumes: - - ./filesystems:/qc-fs - - ./mount:/mnt + - ../filesystems:/qc-fs + - ../mount:/mnt environment: # Edit this to your needs. This should be just the file name, not the path. |