Removed m1 specific docker compose. Added buildx commands.

.github/workflows/docker-cd-dev.yml

@@ -15,15 +15,19 @@ jobs:
       with:
         submodules: true
 
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         push: true
         tags: codexrems/rems-administrator:REMSvExperimental

.github/workflows/docker-cd.yml

@@ -14,16 +14,20 @@ jobs:
       uses: actions/checkout@v2
       with:
           submodules: true
-
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         push: true
         tags: codexrems/rems-administrator:REMSvCurrent

DeveloperSetupGuide.md

@@ -300,7 +300,13 @@ or
 ```bash		
     docker-compose -f docker-compose-dev.yml build --no-cache --pull [<service_name1> <service_name2> ...] 		
     docker-compose -f docker-compose-dev.yml up --force-recreate  [<service_name1> <service_name2> ...]		
-```		
+```
+** Note for Apple M1 Mac developers: **
+Prepend `docker-compose` commands with `COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 DOCKER_DEFAULT_PLATFORM=linux/arm64`.
+```bash
+    COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 DOCKER_DEFAULT_PLATFORM=linux/arm64 docker-compose -f docker-compose-dev.yml up
+```
+
 ```bash		
     # Options:		
     #   --force-recreate                        Recreate containers even if their configuration and image haven't changed.		

SimpleSetupGuide.md

@@ -131,10 +131,10 @@ Your computer must have these minimum requirements:
         docker-compose up
     ```
 
-    Note, if you are using an M1/M2 mac, you need to use the following command to start the docker compose application
+    Note, if you are using an M1/M2 mac, you'll need to prepend `docker-compose` commands with `COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 DOCKER_DEFAULT_PLATFORM=linux/arm64`.
     ```bash
         cd REMS # Need to execute commands in directory with corresponding docker-compose.yml file located in the REMS repository
-        docker-compose -f docker-compose-m1.yml up
+        COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 DOCKER_DEFAULT_PLATFORM=linux/arm64 docker-compose up
     ```
 
 ### 4. Verify everything is working