Merge pull request #12 from russgmoore/develop

Support for Apple M1/M2 ARM64
f5devcentral · May 8, 2023 · d701fee · d701fee
2 parents e1fb5f2 + cdc0b0f
commit d701fee
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 5 deletions.
diff --git a/code-server/config.yaml b/code-server/config.yaml
@@ -0,0 +1,8 @@
+ibind-addr: 0.0.0.0:8080
+auth: none
+password: f7acd02598357ad71e384fce
+cert: false
+user-data-dir: /home/user
+extention-dir: /home/code-server
+disable-telemtry: true
+disable-update-check: true
diff --git a/containthedocs-bash.sh b/containthedocs-bash.sh
@@ -3,8 +3,9 @@
 set -x
 
 COMMAND="/bin/bash"
+ARCH=`uname -m`
 
-. ./containthedocs-image
+. ./containthedocs-image-$ARCH
 
 exec docker run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \

diff --git a/containthedocs-build.sh b/containthedocs-build.sh
@@ -3,8 +3,9 @@
 set -x
 
 COMMAND=(/bin/bash -c "sudo pip install -r requirements.txt -U ; make -C docs clean html")
+ARCH=`uname -m`
 
-. ./containthedocs-image
+. ./containthedocs-image-$ARCH
 
 exec docker run --rm -t \
   -v "$PWD":"$PWD" --workdir "$PWD" \

diff --git a/containthedocs-clean.sh b/containthedocs-clean.sh
@@ -3,8 +3,9 @@
 set -x
 
 COMMAND="make -C docs clean"
+ARCH=`uname -m`
 
-. ./containthedocs-image
+. ./containthedocs-image-$ARCH
 
 exec docker run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \

diff --git a/containthedocs-code-server.sh b/containthedocs-code-server.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -x
+
+
+COMMAND="scripts/code-server.sh"
+DOCKER_RUN_ARGS="--name code-server -p 3000:8080"
+ARCH=`uname -m`
+
+. ./containthedocs-image-$ARCH
+
+exec docker run --rm -it \
+  -v "$PWD":"$PWD" --workdir "$PWD" \
+  ${DOCKER_RUN_ARGS} \
+  -e "LOCAL_USER_ID=$(id -u)" \
+  ${DOC_IMG} ${COMMAND}
diff --git a/containthedocs-convert.sh b/containthedocs-convert.sh
@@ -8,8 +8,9 @@ if [ "$#" -ne 1 ]; then
 fi
 
 COMMAND="scripts/convertdocx.sh $1"
+ARCH=`uname m`
 
-. ./containthedocs-image
+. ./containthedocs-image-$ARCH
 
 exec docker run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \

diff --git a/containthedocs-image-arm64 b/containthedocs-image-arm64
@@ -0,0 +1 @@
+: ${DOC_IMG:=wetspark/combo-ctd:arm64}
diff --git a/containthedocs-image-x86_64 b/containthedocs-image-x86_64
@@ -0,0 +1 @@
+: ${DOC_IMG:=wetspark/combo-ctd:x86_64}
diff --git a/containthedocs-wget b/containthedocs-wget
@@ -2,7 +2,9 @@
 
 set -x
 
-. ../../containthedocs-image
+ARCH=`uname -m`
+
+. ../../containthedocs-image-$ARCH
 
 exec docker run --rm -it \
   -v "$PWD":"$PWD" --workdir "$PWD" \

diff --git a/scripts/code-server.sh b/scripts/code-server.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -x
+
+/usr/bin/code-server --config /home/code-server/config.yaml "$PWD"