Skip to content

Commit ded99fd

Browse files
authored
Merge pull request #826 from sseide/aio-image-updates
docker all-in-one image updates for Debian Bookworm base image
2 parents 642033b + de2af71 commit ded99fd

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

deploy/docker/Dockerfile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]
5151
##
5252
FROM ubuntu:jammy as build-node-service
5353

54-
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential gnupg
54+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates build-essential gnupg
5555

5656
# Add nodejs repo and keys
5757
RUN mkdir -p /etc/apt/keyrings \
@@ -83,7 +83,7 @@ RUN chmod +x /lowcoder/node-service/*.sh
8383
FROM ubuntu:jammy as lowcoder-ce-node-service
8484
LABEL maintainer="lowcoder"
8585

86-
RUN apt update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates gnupg
86+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y curl ca-certificates gnupg
8787

8888
# Add nodejs repo and keys
8989
RUN mkdir -p /etc/apt/keyrings \
@@ -200,15 +200,9 @@ RUN mkdir -p /etc/apt/keyrings \
200200
# Install required packages
201201
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y bash gnupg curl lsb-release \
202202
&& curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg \
203-
&& 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 \
203+
&& echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb bookworm main" | tee /etc/apt/sources.list.d/redis.list \
204204
&& curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | gpg --dearmor -o /usr/share/keyrings/mongodb-archive-keyring.gpg \
205-
&& 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 \
206-
&& if [ "$(dpkg --print-architecture)" = "amd64" ] || [ "$(dpkg --print-architecture)" = "i386" ]; then \
207-
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; \
208-
else \
209-
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; \
210-
fi \
211-
&& dpkg -i libssl1.1_1.1.1f-1ubuntu2_$(dpkg --print-architecture).deb \
205+
&& echo "deb [signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] https://repo.mongodb.org/apt/debian bookworm/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
212206
&& apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends -y \
213207
mongodb-org \
214208
redis \

deploy/docker/all-in-one/etc/supervisord.conf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
file=/var/run/supervisor.sock ; (the path to the socket file)
55
chmod=0700 ; sockef file mode (default 0700)
66

7-
[inet_http_server] ; inet (TCP) server disabled by default
8-
port=*:9001 ; (ip_address:port specifier, *:port for all iface)
7+
;[inet_http_server] ; inet (TCP) server disabled by default
8+
;port=*:9001 ; (ip_address:port specifier, *:port for all iface)
99
;username=user ; (default is no username (open server))
1010
;password=123 ; (default is no password (open server))
1111

@@ -37,8 +37,8 @@ files = /lowcoder/etc/supervisord/conf-enabled/*.conf
3737
# ; This event listener is used to capture processes log
3838
# ; and forward to container log using supervisor_stdout
3939
# ; Ref: https://github.com/coderanger/supervisor-stdout
40-
# [eventlistener:stdout]
41-
# command = supervisor_stdout
42-
# buffer_size = 100
43-
# events = PROCESS_LOG
40+
# [eventlistener:stdout]
41+
# command = supervisor_stdout
42+
# buffer_size = 100
43+
# events = PROCESS_LOG
4444
# result_handler = supervisor_stdout:event_handler

0 commit comments

Comments
 (0)