Skip to content

Commit 3ae0c1f

Browse files
neon-balconyneon-balcony
authored
Merge pull request lowcoder-org#225 from jerry-goodman/develop
docker build support arm architecture
2 parents 86b40f6 + be30fb7 commit 3ae0c1f

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

‎deploy/docker/Dockerfile

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN jlink --add-modules java.base,java.compiler,java.datatransfer,java.desktop,j
1111
##
1212
## Build Openblocks api-service application
1313
##
14-
FROM maven:3.8-eclipse-temurin-17-alpine AS build-api-service
14+
FROM maven:3.8-eclipse-temurin-17 AS build-api-service
1515
COPY ./server/api-service /openblocks-server
1616
WORKDIR /openblocks-server
1717
RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
@@ -66,16 +66,12 @@ CMD [ "sh" , "/openblocks/api-service/entrypoint.sh" ]
6666
##
6767
FROM ubuntu:jammy as build-node-service
6868

69-
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl xz-utils ca-certificates \
70-
&& mkdir -p /openblocks/node-service/nodejs
69+
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates
7170

72-
# Download and extract nodejs
73-
RUN curl -fsSL 'https://nodejs.org/dist/v19.4.0/node-v19.4.0-linux-x64.tar.xz' | tar --directory /openblocks/node-service/nodejs --strip-components=1 -Jxf -
74-
75-
# Install yarn
76-
ENV PATH="/openblocks/node-service/nodejs/bin:${PATH}"
77-
#RUN export PATH=${PATH}:/openblocks/node-service/nodejs/bin \
78-
RUN npm install -g yarn
71+
# Download nodejs and install yarn
72+
RUN curl -sL https://deb.nodesource.com/setup_19.x | bash - \
73+
&& apt-get install --no-install-recommends -y nodejs \
74+
&& npm install -g yarn
7975

8076
# Copy and build the node-service app
8177
COPY server/node-service/ /openblocks/node-service/app/
@@ -97,7 +93,10 @@ RUN chmod +x /openblocks/node-service/*.sh
9793
FROM ubuntu:jammy as openblocks-ce-node-service
9894
LABEL maintainer="openblocks"
9995

100-
RUN apt-get update && apt-get install -y --no-install-recommends gosu \
96+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates \
97+
&& curl -sL https://deb.nodesource.com/setup_19.x | bash - \
98+
&& apt-get install --no-install-recommends -y nodejs gosu \
99+
&& npm install -g yarn \
101100
&& rm -rf /var/cache/apt/lists \
102101
&& addgroup --system --gid 9001 openblocks \
103102
&& adduser --system --disabled-password --no-create-home --uid 9001 --gid 9001 openblocks
@@ -165,12 +164,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
165164
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
166165
&& echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb bullseye main" | tee /etc/apt/sources.list.d/redis.list \
167166
&& curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
168-
&& echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
167+
&& 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 \
168+
&& curl -sL https://deb.nodesource.com/setup_19.x | bash - \
169169
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
170-
mongodb-org=4.4.6 \
170+
mongodb-org \
171171
redis \
172172
supervisor \
173173
gosu \
174+
nodejs \
175+
&& npm install -g yarn \
174176
&& rm -rf /var/cache/apt/lists
175177

176178
# Add openblocks api-service

‎deploy/docker/all-in-one/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ chown -R ${USER_ID}:${GROUP_ID} /openblocks-stacks/ /openblocks/etc
3636
SUPERVISOR_AVAILABLE="/openblocks/etc/supervisord/conf-available"
3737
SUPERVISOR_ENABLED="/openblocks/etc/supervisord/conf-enabled"
3838

39+
# Create folder for supervisor conf-enabled
40+
mkdir -p ${SUPERVISOR_ENABLED}
41+
3942
# Recreate links to enabled services
4043
rm -f ${SUPERVISOR_ENABLED}/*.conf
4144

‎deploy/docker/node-service/entrypoint.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ set -e
44

55
export USER_ID=${PUID:=9001}
66
export GROUP_ID=${PGID:=9001}
7-
export PATH="/openblocks/node-service/nodejs/bin:${PATH}"
87
export API_HOST="${OPENBLOCKS_API_SERVICE_URL:=http://localhost:8080}"
98

109
# Run init script

0 commit comments

Comments
 (0)