diff options
| author | Judah Fuller <[email protected]> | 2023-07-18 09:15:01 +0100 |
|---|---|---|
| committer | Judah Fuller <[email protected]> | 2023-07-18 09:15:01 +0100 |
| commit | be45cd595535bdbb0e2d62fa2c17c90115dc069d (patch) | |
| tree | 92a014b8a0c6a2fd55bb1c483dbdde2ae5a55d3f /CorOS-dev-environment/CorOS-build-env | |
| parent | 8b2a129b52de685e8ceda860eb4c7f1bca9161da (diff) | |
| download | OpenCortex-be45cd595535bdbb0e2d62fa2c17c90115dc069d.tar.gz OpenCortex-be45cd595535bdbb0e2d62fa2c17c90115dc069d.zip | |
Fix dock pulling from cloud instead of local
Diffstat (limited to 'CorOS-dev-environment/CorOS-build-env')
| -rw-r--r-- | CorOS-dev-environment/CorOS-build-env/Dockerfile | 7 | ||||
| -rw-r--r-- | CorOS-dev-environment/CorOS-build-env/docker-compose.yaml | 36 |
2 files changed, 22 insertions, 21 deletions
diff --git a/CorOS-dev-environment/CorOS-build-env/Dockerfile b/CorOS-dev-environment/CorOS-build-env/Dockerfile index 9ddd439..e736205 100644 --- a/CorOS-dev-environment/CorOS-build-env/Dockerfile +++ b/CorOS-dev-environment/CorOS-build-env/Dockerfile @@ -1,8 +1,9 @@ # Use official Ubuntu as our base# Use official Ubuntu as our base -FROM opencortex/coros-emu:latest +FROM 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 +RUN apt-get -y update +RUN 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 @@ -19,7 +20,7 @@ ARG LINUX_ADDIN_VERSION="1.3.1" WORKDIR ${TOOLCHAIN_PATH} # Copy the install_toolchain.sh to /sc5xx_dev -COPY install_toolchain.sh . +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 diff --git a/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml b/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml index 3f4c9d6..f1278e5 100644 --- a/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml +++ b/CorOS-dev-environment/CorOS-build-env/docker-compose.yaml @@ -1,25 +1,25 @@ # 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 + 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 + 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 + environment: + # Edit this to your needs. This should be just the file name, not the path. + - UPDATE_FILE=verify.bin.gz - # Port forward the VNC port - ports: - - "5900:5900" + # Port forward the VNC port + ports: + - "5900:5900" - privileged: true - entrypoint: /bin/bash -c "while true; do sleep 1; done"
\ No newline at end of file + privileged: true + entrypoint: /bin/bash -c "while true; do sleep 1; done" |