Fix dock pulling from cloud instead of local

5 files changed, 58 insertions, 47 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"
diff --git a/CorOS-dev-environment/CorOS-emulation/Dockerfile b/CorOS-dev-environment/CorOS-emulation/Dockerfile
index 1f24b79..b556f64 100644
--- a/CorOS-dev-environment/CorOS-emulation/Dockerfile
+++ b/CorOS-dev-environment/CorOS-emulation/Dockerfile
@@ -13,10 +13,10 @@ RUN mkdir qc-fs qc-fs-uncompressed qt_src
 
 WORKDIR /qt_src
 # # Copy and run the installer
-COPY qt-compiled-4.8.7.tar.gz install_qt_compiled.sh .
+COPY qt-compiled-4.8.7.tar.gz install_qt_compiled.sh ./
 
 WORKDIR /
-COPY init_system.sh update-builder.sh .
+COPY init_system.sh update-builder.sh ./
 RUN dos2unix init_system.sh update-builder.sh /qt_src/install_qt_compiled.sh
 
 ENTRYPOINT ["/bin/bash"]
diff --git a/CorOS-dev-environment/CorOS-emulation/docker-compose.yaml b/CorOS-dev-environment/CorOS-emulation/docker-compose.yaml
index 743a1a0..cc5f268 100644
--- a/CorOS-dev-environment/CorOS-emulation/docker-compose.yaml
+++ b/CorOS-dev-environment/CorOS-emulation/docker-compose.yaml
@@ -1,25 +1,25 @@
 # Docker compose file for easy volume mounting and running of the container
 
 services:
-  coros-emu:
-    image: opencortex/coros-emu:latest
-    build:
-      context: ../
-      dockerfile: CorOS-emulation/Dockerfile
-      tags:
-        - opencortex/coros-emu:latest
+    coros-emu:
+        image: opencortex/coros-emu:latest
+        build:
+            context: ../
+            dockerfile: CorOS-emulation/Dockerfile
+            tags:
+                - opencortex/coros-emu: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=update-v6_MZO3_RudwwcoQAF3iLtPQ0ERwy4w6.bin.gz
-    
-    # Port forward the VNC port
-    ports:
-      - "5900:5900"
+        environment:
+            # Edit this to your needs. This should be just the file name, not the path.
+            - UPDATE_FILE=update-v6_MZO3_RudwwcoQAF3iLtPQ0ERwy4w6.bin.gz
 
-    privileged: true
-    entrypoint: /bin/bash -c "while true; do sleep 1; done"
\ No newline at end of file
+        # Port forward the VNC port
+        ports:
+            - "5900:5900"
+
+        privileged: true
+        entrypoint: /bin/bash -c "while true; do sleep 1; done"
diff --git a/CorOS-dev-environment/README.md b/CorOS-dev-environment/README.md
index d2f1e24..4d319b8 100644
--- a/CorOS-dev-environment/README.md
+++ b/CorOS-dev-environment/README.md
@@ -58,26 +58,36 @@ export QT_QWS_FONTDIR=/etc/fonts
 
 ## Running On M1
 
+If you docker enviroment (~/.docker)is not alread accessable by your user, run:
+
+```bash
+sudo chmod -R 777 ~/.docker
+```
+
 To build the dev enviroment on M1 _you must enable Rosseta x86 Emulation_ (Docker Desktop, Settings, In Development, Beta Features).
 Then you have to pull, build and compose the container in seperate steps, adding the platform flag to each step.
 
-Pull the base image:
+Pull the base image for the enviroment you wish to build:
 
 ```bash
-docker pull docker.io/library/ubuntu:18.04 --platform linux/amd64
+CorOS-Emu:
+docker pull docker.io/library/debian:buster-slim --platform linux/amd64
+
+CorOS-Dev:
+
 ```
 
 Build the cortex-emu and cortex-dev images:
 
 ```bash
-sudo docker build . --platform=linux/amd64 -t cortex-emu
-sudo docker build . --platform=linux/amd64 -t cortex-dev
+docker build . --platform=linux/amd64 -t coros-emu
+docker build . --platform=linux/amd64 -t cortex-dev
 ```
 
 Compose the container:
 
 ```bash
-sudo docker compose up -d
+docker compose up -d
 ```
 
 ## Creating an update package