Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25715aa

Browse files
committed
new: update java to version 24 and nodejs to version 24
1 parent0a76fc9 commit25715aa

File tree

17 files changed

+38
-36
lines changed

17 files changed

+38
-36
lines changed

‎deploy/docker/Dockerfile‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##
22
## Build Lowcoder api-service application
33
##
4-
FROM maven:3-eclipse-temurin-21 AS build-api-service
4+
FROM maven:3-eclipse-temurin-24 AS build-api-service
55

66
# Build lowcoder-api
77
COPY ./server/api-service /lowcoder-server
@@ -26,7 +26,7 @@ RUN chmod +x /lowcoder/api-service/*.sh
2626
## To create a separate image out of it, build it with:
2727
## DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcoder-ce-api-service --target lowcoder-ce-api-service .
2828
##
29-
FROM eclipse-temurin:21-jammy AS lowcoder-ce-api-service
29+
FROM eclipse-temurin:24-noble AS lowcoder-ce-api-service
3030
LABEL maintainer="lowcoder"
3131

3232
RUN apt-get update && apt-get install -y --no-install-recommends gosu \
@@ -51,14 +51,12 @@ CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]
5151
##
5252
## Build lowcoder node service
5353
##
54-
FROM ubuntu:jammy AS build-node-service
54+
FROM ubuntu:noble AS build-node-service
5555

5656
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential gnupg
5757

5858
# Add nodejs repo and keys
59-
RUN mkdir -p /etc/apt/keyrings \
60-
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
61-
&& echo"deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_23.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
59+
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash -
6260

6361
# Download nodejs and install yarn
6462
RUN apt-get update \
@@ -82,15 +80,13 @@ RUN chmod +x /lowcoder/node-service/*.sh
8280
## To create a separate image out of it, build it with:
8381
## DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcoder-ce-node-service --target lowcoder-ce-node-service .
8482
##
85-
FROM ubuntu:jammy AS lowcoder-ce-node-service
83+
FROM ubuntu:noble AS lowcoder-ce-node-service
8684
LABEL maintainer="lowcoder"
8785

8886
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates gnupg
8987

9088
# Add nodejs repo and keys
91-
RUN mkdir -p /etc/apt/keyrings \
92-
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
93-
&& echo"deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_23.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
89+
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash -
9490

9591
# Download nodejs and install yarn
9692
RUN apt-get update \
@@ -147,7 +143,7 @@ RUN yarn build
147143
## To create a separate image out of it, build it with:
148144
## DOCKER_BUILDKIT=1 docker build -f deploy/docker/Dockerfile -t lowcoderorg/lowcoder-ce-frontend --target lowcoder-ce-frontend .
149145
##
150-
FROM nginx:1.27.4 AS lowcoder-ce-frontend
146+
FROM nginx:1.29.1 AS lowcoder-ce-frontend
151147
LABEL maintainer="lowcoder"
152148

153149
# Change default nginx user into lowcoder user and remove default nginx config
@@ -188,7 +184,7 @@ EXPOSE 3443
188184
##
189185
## Build Lowcoder all-in-one image
190186
##
191-
FROM ubuntu:jammy
187+
FROM ubuntu:noble
192188
LABEL maintainer="lowcoder"
193189

194190
# Install essential tools
@@ -197,35 +193,39 @@ RUN apt-get update \
197193
&& rm -rf /var/cache/apt/lists /var/lib/apt/lists/* /var/log/dpkg.log \
198194
&& apt-get clean
199195

196+
# Install nodejs apt repo
197+
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash -
198+
200199
# Add required apt repositories and signing keys
201-
RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource-keyring.gpg \
202-
&& echo"deb [signed-by=/usr/share/keyrings/nodesource-keyring.gpg] https://deb.nodesource.com/node_23.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
200+
RUN mkdir -p /usr/share/keyrings \
203201
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
204202
&& echo"deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb `lsb_release -cs` main" | tee /etc/apt/sources.list.d/redis.list \
205-
&& curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
206-
&& echo"deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu `lsb_release -cs`/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list \
203+
&& curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
204+
&& echo"deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] https://repo.mongodb.org/apt/ubuntu `lsb_release -cs`/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list \
207205
&& curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /usr/share/keyrings/nginx-archive-keyring.gpg \
208-
&& echo"deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/ubuntu `lsb_release -cs` nginx" | tee /etc/apt/sources.list.d/nginx.list
206+
&& echo"deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/mainline/ubuntu `lsb_release -cs` nginx" | tee /etc/apt/sources.list.d/nginx.list \
207+
&& curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor -o /usr/share/keyrings/adoptium-keyring.gpg \
208+
&& echo"deb [signed-by=/usr/share/keyrings/adoptium-keyring.gpg] https://packages.adoptium.net/artifactory/deb `lsb_release -cs` main" | tee /etc/apt/sources.list.d/adoptium.list
209209

210210

211211
# Install required packages
212212
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
213-
nginx=1.27.4-1~jammy \
213+
nginx=1.29.1-1~noble \
214214
mongodb-org \
215215
redis \
216216
supervisor \
217217
gosu \
218218
nodejs \
219-
openjdk-21-jdk-headless \
219+
temurin-24-jdk \
220220
&& npm install -g yarn \
221221
&& rm -rf /var/cache/apt/lists /var/lib/apt/lists/* /var/log/dpkg.log \
222222
&& apt-get clean \
223223
&& rm -rf /tmp/*
224224

225225
# Use configuration setup from official nginx image
226226
RUN rm -rf /etc/nginx/nginx.conf
227-
COPY --from=nginx:1.27.4 /docker-entrypoint.d /docker-entrypoint.d
228-
COPY --from=nginx:1.27.4 /docker-entrypoint.sh /docker-entrypoint.sh
227+
COPY --from=nginx:1.29.1 /docker-entrypoint.d /docker-entrypoint.d
228+
COPY --from=nginx:1.29.1 /docker-entrypoint.sh /docker-entrypoint.sh
229229

230230
# Add lowcoder user
231231
RUN usermod --login lowcoder --uid 9001 nginx \

‎server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19-
<java.version>21</java.version>
19+
<java.version>${jdk.version}</java.version>
2020
<maven.compiler.source>${java.version}</maven.compiler.source>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
2222
<plugin.id>clickHouse-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>es-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>googleSheets-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/graphqlPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>graphql-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/mongoPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>mongo-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>mssql-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<properties>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
20-
<java.version>21</java.version>
20+
<java.version>${jdk.version}</java.version>
2121
<maven.compiler.source>${java.version}</maven.compiler.source>
2222
<maven.compiler.target>${java.version}</maven.compiler.target>
2323
<plugin.id>mysql-plugin</plugin.id>

‎server/api-service/lowcoder-plugins/oraclePlugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19-
<java.version>21</java.version>
19+
<java.version>${jdk.version}</java.version>
2020
<maven.compiler.source>${java.version}</maven.compiler.source>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
2222

‎server/api-service/lowcoder-plugins/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
</repositories>
2323

2424
<properties>
25+
<java.version>${jdk.version}</java.version>
2526
<testcontainers.version>1.21.0</testcontainers.version>
2627
</properties>
2728

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp