Skip to content

Commit 84a66e3

Browse files
chore(Docker): Upgrade Ubuntu to 24.04 (azerothcore#24459)
Co-authored-by: sogladev <sogladev@gmail.com>
1 parent c0c86d2 commit 84a66e3

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

apps/docker/Dockerfile

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG UBUNTU_VERSION=22.04 # lts
1+
ARG UBUNTU_VERSION=24.04 # lts
22

33
# This target lays out the general directory skeleton for AzerothCore,
44
# This target isn't intended to be directly used
@@ -67,7 +67,7 @@ RUN apt-get update \
6767
build-essential ccache libtool cmake-data make cmake clang \
6868
git lsb-base curl unzip default-mysql-client openssl \
6969
default-libmysqlclient-dev libboost-all-dev libssl-dev libmysql++-dev \
70-
libreadline-dev zlib1g-dev libbz2-dev libncurses5-dev \
70+
libreadline-dev zlib1g-dev libbz2-dev libncurses5-dev liblzma-dev \
7171
&& rm -rf /var/lib/apt/lists/*
7272

7373
COPY CMakeLists.txt /azerothcore/CMakeLists.txt
@@ -117,22 +117,26 @@ ARG DOCKER_USER=acore
117117
ENV ACORE_COMPONENT=undefined
118118

119119
# Install base dependencies for azerothcore
120-
RUN apt-get update && \
121-
apt-get install -y --no-install-recommends \
122-
libmysqlclient21 libreadline8 \
123-
gettext-base default-mysql-client && \
124-
rm -rf /var/lib/apt/lists/*
120+
RUN apt-get update \
121+
&& apt-get install -y --no-install-recommends \
122+
libmysqlclient21 libreadline8 libicu74 libncurses5-dev \
123+
gettext-base default-mysql-client \
124+
adduser \
125+
&& rm -rf /var/lib/apt/lists/*
125126

126127
COPY --from=build /azerothcore/env/dist/etc/ /azerothcore/env/ref/etc
127128

128129
VOLUME /azerothcore/env/dist/etc
129130

130131
ENV PATH="/azerothcore/env/dist/bin:$PATH"
131132

132-
RUN groupadd --gid "$GROUP_ID" "$DOCKER_USER" && \
133-
useradd -d /azerothcore --uid "$USER_ID" --gid "$GROUP_ID" "$DOCKER_USER" && \
134-
passwd -d "$DOCKER_USER" && \
135-
chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore
133+
# To use GID/UID 1000 in ubuntu > 23.04 the existing user must be deleted
134+
# See https://bugs.launchpad.net/cloud-images/+bug/2005129
135+
RUN userdel --remove ubuntu \
136+
&& addgroup --gid "$GROUP_ID" "$DOCKER_USER" \
137+
&& adduser --disabled-password --gecos '' --uid "$USER_ID" --gid "$GROUP_ID" "$DOCKER_USER" \
138+
&& passwd -d "$DOCKER_USER" \
139+
&& chown -R "$DOCKER_USER:$DOCKER_USER" /azerothcore
136140

137141
COPY --chown=$USER_ID:$GROUP_ID \
138142
--chmod=755 \

0 commit comments

Comments
 (0)