From 63e1388891336d5af89d46fc078804e267871ea4 Mon Sep 17 00:00:00 2001 From: Quentin Ormancey <23664359+louga31@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:10:53 +0200 Subject: [PATCH 1/3] fix: ARM docker build --- deploy/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index a3750e7a7..cc707f149 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -66,7 +66,7 @@ CMD [ "sh" , "/lowcoder/api-service/entrypoint.sh" ] ## FROM ubuntu:jammy as build-node-service -RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates +RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential # Download nodejs and install yarn RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - \ From 65f6f2d3970c1fce0cbba0d4cb63f635c2625929 Mon Sep 17 00:00:00 2001 From: Quentin Ormancey <23664359+louga31@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:39:53 +0200 Subject: [PATCH 2/3] fix: OpenSSL on ARM --- deploy/docker/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index cc707f149..3baa4ec7a 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -175,7 +175,12 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg arch=amd64,arm64] http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \ && curl -sL https://deb.nodesource.com/setup_19.x | bash - \ && curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb --output libssl1.1_1.1.1f-1ubuntu2_amd64.deb \ - && dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb \ + && if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \ + curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \ + else \ + curl -sL http://ports.ubuntu.com/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \ + fi \ + && dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \ mongodb-org \ redis \ From 73b36029b8c7aaff024a6265ce8d4686330f4916 Mon Sep 17 00:00:00 2001 From: Quentin Ormancey <23664359+louga31@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:40:47 +0200 Subject: [PATCH 3/3] fix: Typo --- deploy/docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 3baa4ec7a..b638e62c8 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -174,7 +174,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal && curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \ && echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg arch=amd64,arm64] http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \ && curl -sL https://deb.nodesource.com/setup_19.x | bash - \ - && curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb --output libssl1.1_1.1.1f-1ubuntu2_amd64.deb \ && if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \ curl -sL http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb --output libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb; \ else \