Skip to content
This repository was archived by the owner on Dec 30, 2025. It is now read-only.

Commit bf0cd9e

Browse files
committed
build(docker): update Dockerfiles and .dockerignore for improved build process
Update the .dockerignore to include additional scripts required for Docker builds, ensuring necessary files are available during the build process. Remove version-specific dependencies in Dockerfiles to allow for more flexible and up-to-date package installations, reducing maintenance overhead and potential conflicts with outdated versions. Change the exposed port in the Gamja Dockerfile to a fixed value (8080) for consistency and predictability in container networking. These changes enhance the build process by making it more robust, maintainable, and adaptable to different environments.
1 parent 6a7c005 commit bf0cd9e

File tree

4 files changed

+33
-28
lines changed

4 files changed

+33
-28
lines changed

.dockerignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ Dockerfile*
1515

1616
# Development and CI files
1717
scripts/
18-
# Keep webpanel startup script for Docker build
18+
# Keep required scripts for Docker build
19+
!scripts/start-services.sh
20+
!scripts/manage-modules.sh
21+
!scripts/module-config.sh
1922
!scripts/start-webpanel.sh
2023
renovate.json
2124
.github/

Dockerfile

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,29 @@ ENV DEBIAN_FRONTEND=noninteractive \
1818
RUN apt-get update && \
1919
apt-get upgrade -y && \
2020
apt-get install -y --no-install-recommends \
21-
build-essential=12.9 \
22-
gdb=13.1-3 \
23-
gettext=0.21-12 \
24-
libargon2-dev=0~20171227-0.3+deb12u1 \
25-
libc-ares-dev=1.18.1-3 \
26-
libcurl4-openssl-dev=7.88.1-10+deb12u12 \
27-
libpcre2-dev=10.42-1 \
28-
libssl-dev=3.0.17-1~deb12u2 \
29-
libsodium-dev=1.0.18-1 \
30-
pkg-config=1.8.1-1 \
31-
wget=1.21.3-1+deb12u1 \
32-
ca-certificates=20230311+deb12u1 \
33-
git=1:2.39.2-1.1 \
21+
build-essential \
22+
gdb \
23+
gettext \
24+
libargon2-dev \
25+
libc-ares-dev \
26+
libcurl4-openssl-dev \
27+
libpcre2-dev \
28+
libssl-dev \
29+
libsodium-dev \
30+
pkg-config \
31+
wget \
32+
ca-certificates \
33+
git \
3434
# Additional Atheme dependencies for better functionality
35-
libidn2-dev=2.3.3-1+b1 \
36-
nettle-dev=3.8.1-2 \
37-
libqrencode-dev=4.1.1-1 \
35+
libidn2-dev \
36+
nettle-dev \
37+
libqrencode-dev \
3838
# Development tools for better builds
39-
autoconf=2.71-3 \
40-
automake=1:1.16.5-1.3 \
41-
libtool=2.4.7-7~deb12u1 && \
39+
autoconf \
40+
automake \
41+
libtool \
42+
# Perl development libraries for Atheme Perl support
43+
libperl-dev && \
4244
apt-get clean && \
4345
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
4446

web/gamja/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RUN npm install --omit=dev
3434
FROM base AS dev
3535

3636
COPY --from=builder --chown=gamja:gamja /var/www/html/gamja/ /var/www/html/gamja
37-
COPY --chown=gamja:gamja conf/config.json /var/www/html/gamja/config.json
37+
COPY --chown=gamja:gamja web/gamja/conf/config.json /var/www/html/gamja/config.json
3838

3939
WORKDIR /var/www/html/gamja
4040

41-
EXPOSE GAMJA_PORT
41+
EXPOSE 8080

web/webpanel/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ ENV DEBIAN_FRONTEND=noninteractive \
1818
# Install system dependencies
1919
RUN apt-get update && \
2020
apt-get install -y --no-install-recommends \
21-
git=1:2.39.2-1.1 \
22-
unzip=6.0-28 \
23-
libzip-dev=1.9.2-1 \
24-
libssl-dev=3.0.17-1~deb13u1 \
25-
ca-certificates=20230311+deb13u1 \
26-
nginx=1.22.1-9+deb13u1 && \
21+
git \
22+
unzip \
23+
libzip-dev \
24+
libssl-dev \
25+
ca-certificates \
26+
nginx && \
2727
apt-get clean && \
2828
rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
2929

0 commit comments

Comments
 (0)