Skip to content

Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences

Tweaks to get docker build to work on Apple Silicon machines (#745)

Jason Bosco61986e700add
diff --git a/.gitignore b/.gitignore
index 64f9e71c..499331cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ cmake-build-debug
cmake-build-release
*.pem
.DS_Store
+typesense-server-data/
diff --git a/docker-build.sh b/docker-build.sh
index 059afaa9..7761f11a 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -32,30 +32,30 @@ fi
TYPESENSE_DEV_IMAGE="typesense-development:27-JUN-2022-1"
ARCH_NAME="amd64"
-if [[ "$@" == *"--graviton2"* ]]; then
+if [[ "$@" == *"--graviton2"* ]] || [[ "$@" == *"--arm"* ]]; then
TYPESENSE_DEV_IMAGE="typesense-development-arm:27-JUN-2022-1"
ARCH_NAME="arm64"
fi
echo "Building Typesense $TYPESENSE_VERSION..."
-docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
+docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
-DCMAKE_BUILD_TYPE=Release -H/typesense -B/typesense/$BUILD_DIR
-docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE make typesense-server -C/typesense/$BUILD_DIR
+docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE make typesense-server -C/typesense/$BUILD_DIR
if [[ "$@" == *"--test"* ]]; then
echo "Running tests"
- docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cp /typesense/$BUILD_DIR/Makefile /typesense/$TEST_BUILD_DIR
- docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cp -R /typesense/$BUILD_DIR/CMakeFiles /typesense/$TEST_BUILD_DIR/
- docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE make typesense-test -C/typesense/$TEST_BUILD_DIR
- docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE chmod +x /typesense/$TEST_BUILD_DIR/typesense-test
- docker run -it -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE /typesense/$TEST_BUILD_DIR/typesense-test
+ docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cp /typesense/$BUILD_DIR/Makefile /typesense/$TEST_BUILD_DIR
+ docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE cp -R /typesense/$BUILD_DIR/CMakeFiles /typesense/$TEST_BUILD_DIR/
+ docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE make typesense-test -C/typesense/$TEST_BUILD_DIR
+ docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE chmod +x /typesense/$TEST_BUILD_DIR/typesense-test
+ docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/$TYPESENSE_DEV_IMAGE /typesense/$TEST_BUILD_DIR/typesense-test
fi
if [[ "$@" == *"--build-deploy-image"* ]]; then
echo "Creating deployment image for Typesense $TYPESENSE_VERSION server ..."
cp $PROJECT_DIR/docker/deployment.Dockerfile $PROJECT_DIR/$BUILD_DIR
- docker build --file $PROJECT_DIR/$BUILD_DIR/deployment.Dockerfile --tag typesense/typesense:$TYPESENSE_VERSION \
+ docker build --platform linux/${ARCH_NAME} --file $PROJECT_DIR/$BUILD_DIR/deployment.Dockerfile --tag typesense/typesense:$TYPESENSE_VERSION \
$PROJECT_DIR/$BUILD_DIR
fi
@@ -69,7 +69,7 @@ fi
#
#if [[ "$@" == *"--create-deb-upload"* ]]; then
-# docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development:09-AUG-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
+# docker run -it --platform linux/${ARCH_NAME} -v $PROJECT_DIR:/typesense typesense/typesense-development:09-AUG-2021-1 cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \
# -DCMAKE_BUILD_TYPE=Debug -H/typesense -B/typesense/$BUILD_DIR
#fi
diff --git a/docker/clion-remote-cpp-env-arm.Dockerfile b/docker/clion-remote-cpp-env-arm.Dockerfile
new file mode 100644
index 00000000..6e7a1292
--- /dev/null
+++ b/docker/clion-remote-cpp-env-arm.Dockerfile
@@ -0,0 +1,68 @@
+# Source: https://github.com/JetBrains/clion-remote/blob/3db8912219cbe572f98677704942fda2e280cf55/Dockerfile.remote-cpp-env
+#
+# CLion remote docker environment
+#
+# Build:
+# docker build -t typesense/typesense-clion-remote-cpp-env-arm:11-OCT-2022-1 -f ./docker/clion-remote-cpp-env-arm.Dockerfile ./docker
+# docker push typesense/typesense-clion-remote-cpp-env-arm:11-OCT-2022-1
+#
+# Run:
+# docker run -d --cap-add sys_ptrace -v`pwd`/typesense-server-data/:/var/lib/typesense -p 127.0.0.1:2222:22 -p 127.0.0.1:8108:8108 --name clion_remote_env typesense/typesense-clion-remote-cpp-env-arm:11-OCT-2022-1
+# docker stop clion_remote_env ; docker rm clion_remote_env
+#
+# If you need to SSH into the container directly:
+# ssh -p 2222 user@localhost
+# Password: password
+#
+# Setup remote host in CLion with the following details:
+# Hostname: localhost
+# Port: 2222
+# Username: user
+# Password: password
+#
+# GDB: /usr/local/bin/gdb
+#
+
+FROM typesense/typesense-development-arm:27-JUN-2022-1
+
+RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get -y install tzdata
+
+RUN apt-get update \
+ && apt-get install -y ssh \
+ ssh \
+ htop \
+ vim \
+ sudo \
+ locales-all \
+ dos2unix \
+ rsync \
+ tar \
+ python \
+ python-dev \
+ git \
+ && apt-get clean
+
+ARG GDB_VERSION=12.1
+ADD http://ftp.gnu.org/gnu/gdb/gdb-${GDB_VERSION}.tar.gz /opt/gdb-${GDB_VERSION}.tar.gz
+RUN tar -C /opt -xf /opt/gdb-${GDB_VERSION}.tar.gz
+RUN cd /opt/gdb-${GDB_VERSION} && ./configure --with-python && make -j8 && make install
+
+ADD https://sourceware.org/pub/valgrind/valgrind-3.17.0.tar.bz2 /opt/valgrind-3.17.0.tar.bz2
+RUN tar -C /opt -xf /opt/valgrind-3.17.0.tar.bz2
+RUN cd /opt/valgrind-3.17.0 && ./configure --prefix=/usr && make -j8 && make install
+
+RUN ( \
+ echo 'LogLevel DEBUG2'; \
+ echo 'PermitRootLogin yes'; \
+ echo 'PasswordAuthentication yes'; \
+ echo 'Subsystem sftp /usr/lib/openssh/sftp-server'; \
+ ) > /etc/ssh/sshd_config_test_clion \
+ && mkdir /run/sshd
+
+RUN useradd -m user \
+ && yes password | passwd user
+
+RUN usermod -s /bin/bash user
+RUN usermod -aG sudo user
+
+CMD ["/usr/sbin/sshd", "-D", "-e", "-f", "/etc/ssh/sshd_config_test_clion"]
\ No newline at end of file