Skip to content

feat: refonte du bootstrap UI et passage du profil retail en master #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valcriss merged 2 commits into from
Mar 28, 2026
Merged

feat: refonte du bootstrap UI et passage du profil retail en master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf1a8c
feat: refonte du bootstrap UI et passage du profil retail en master
valcriss Mar 28, 2026
4b22827
feat: update download progress logging in DatabaseInitializer
valcriss Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docker-build-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- name: 4.4.2
dockerfile: ./Dockerfile.442
tag: danielsilvestre37/trinitycore-docker:4.4.2
- name: 11.2.0
dockerfile: ./Dockerfile.1120
tag: danielsilvestre37/trinitycore-docker:11.2.0
- name: master
dockerfile: ./Dockerfile.master
tag: danielsilvestre37/trinitycore-docker:master

steps:
- name: Checkout code
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/periodic-build-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- name: 4.4.2
dockerfile: ./Dockerfile.442
tag: danielsilvestre37/trinitycore-docker:4.4.2
- name: 11.2.0
dockerfile: ./Dockerfile.1120
tag: danielsilvestre37/trinitycore-docker:11.2.0
- name: master
dockerfile: ./Dockerfile.master
tag: danielsilvestre37/trinitycore-docker:master

steps:
- name: Checkout code
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.335
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ COPY ./src/public /app/dist/public
#-----------------------------------------------------------------------------
# Step 2 : Build TrinityCore
#-----------------------------------------------------------------------------
FROM ubuntu:22.04 AS trinitycore_build
FROM ubuntu:24.04 AS trinitycore_build

ARG TRINITYCORE_BRANCH

# Install only build dependencies
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ libmysqlclient-dev \
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ default-libmysqlclient-dev \
libssl-dev libbz2-dev libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates && \
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 && \
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang 100 && \
Expand All @@ -55,7 +55,7 @@ RUN git clone -b ${TRINITYCORE_BRANCH} --depth=1 https://github.com/TrinityCore/
#-----------------------------------------------------------------------------
# Step 3 : Final image
#-----------------------------------------------------------------------------
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG TRINITYCORE_VERSION

Expand All @@ -69,12 +69,12 @@ COPY --from=trinitycore_build /app/TrinityCore /app/TrinityCore
## Install dependencies
RUN apt-get -yq update && apt-get -yq install curl && \
curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
apt-get -yq install nodejs git libmysqlclient-dev libssl-dev libbz2-dev \
apt-get -yq install nodejs git default-libmysqlclient-dev libssl-dev libbz2-dev \
libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates p7zip-full && \
apt-get clean && rm -rf /var/lib/apt/lists/*

RUN cd /app/backend && chmod +x /app/backend/resources/*.sh && mkdir /app/server/data && mkdir /app/server/logs

EXPOSE 3000
ENV TRINITYCORE_VERSION=${TRINITYCORE_VERSION}
CMD ["node", "/app/backend/server.js"]
CMD ["node", "/app/backend/server.js"]
10 changes: 5 additions & 5 deletions Dockerfile.442
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ COPY ./src/public /app/dist/public
#-----------------------------------------------------------------------------
# Step 2 : Build TrinityCore
#-----------------------------------------------------------------------------
FROM ubuntu:22.04 AS trinitycore_build
FROM ubuntu:24.04 AS trinitycore_build

ARG TRINITYCORE_BRANCH

# Install only build dependencies
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ libmysqlclient-dev \
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ default-libmysqlclient-dev \
libssl-dev libbz2-dev libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates && \
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 && \
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang 100 && \
Expand All @@ -55,7 +55,7 @@ RUN git clone -b ${TRINITYCORE_BRANCH} --depth=1 https://github.com/TrinityCore/
#-----------------------------------------------------------------------------
# Step 3 : Final image
#-----------------------------------------------------------------------------
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG TRINITYCORE_VERSION

Expand All @@ -69,12 +69,12 @@ COPY --from=trinitycore_build /app/TrinityCore /app/TrinityCore
## Install dependencies
RUN apt-get -yq update && apt-get -yq install curl && \
curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
apt-get -yq install nodejs git libmysqlclient-dev libssl-dev libbz2-dev \
apt-get -yq install nodejs git default-libmysqlclient-dev libssl-dev libbz2-dev \
libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates p7zip-full && \
apt-get clean && rm -rf /var/lib/apt/lists/*

RUN cd /app/backend && chmod +x /app/backend/resources/*.sh && mkdir /app/server/data && mkdir /app/server/logs

EXPOSE 3000
ENV TRINITYCORE_VERSION=${TRINITYCORE_VERSION}
CMD ["node", "/app/backend/server.js"]
CMD ["node", "/app/backend/server.js"]
12 changes: 6 additions & 6 deletions Dockerfile.1120 → Dockerfile.master
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Build arguments
#-----------------------------------------------------------------------------
ARG TRINITYCORE_BRANCH=master
ARG TRINITYCORE_VERSION=11.2.0
ARG TRINITYCORE_VERSION=master

#-----------------------------------------------------------------------------
# Step 1 : Build the backend
Expand All @@ -23,12 +23,12 @@ COPY ./src/public /app/dist/public
#-----------------------------------------------------------------------------
# Step 2 : Build TrinityCore
#-----------------------------------------------------------------------------
FROM ubuntu:22.04 AS trinitycore_build
FROM ubuntu:24.04 AS trinitycore_build

ARG TRINITYCORE_BRANCH

# Install only build dependencies
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ libmysqlclient-dev \
RUN apt-get -yq update && apt-get -yq install curl git clang make gcc g++ default-libmysqlclient-dev \
libssl-dev libbz2-dev libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates && \
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100 && \
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang 100 && \
Expand All @@ -55,7 +55,7 @@ RUN git clone -b ${TRINITYCORE_BRANCH} --depth=1 https://github.com/TrinityCore/
#-----------------------------------------------------------------------------
# Step 3 : Final image
#-----------------------------------------------------------------------------
FROM ubuntu:22.04
FROM ubuntu:24.04

ARG TRINITYCORE_VERSION

Expand All @@ -69,12 +69,12 @@ COPY --from=trinitycore_build /app/TrinityCore /app/TrinityCore
## Install dependencies
RUN apt-get -yq update && apt-get -yq install curl && \
curl -fsSL https://deb.nodesource.com/setup_23.x | bash - && \
apt-get -yq install nodejs git libmysqlclient-dev libssl-dev libbz2-dev \
apt-get -yq install nodejs git default-libmysqlclient-dev libssl-dev libbz2-dev \
libreadline-dev libncurses-dev libboost-all-dev mysql-client ca-certificates p7zip-full && \
apt-get clean && rm -rf /var/lib/apt/lists/*

RUN cd /app/backend && chmod +x /app/backend/resources/*.sh && mkdir /app/server/data && mkdir /app/server/logs

EXPOSE 3000
ENV TRINITYCORE_VERSION=${TRINITYCORE_VERSION}
CMD ["node", "/app/backend/server.js"]
CMD ["node", "/app/backend/server.js"]
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ curl -o docker-compose.yml https://raw.githubusercontent.com/valcriss/trinitycor
mkdir client
```

TrinityCore 11.2.0
TrinityCore master

```bash
mkdir trinitycore-docker
cd trinitycore-docker
curl -o docker-compose.yml https://raw.githubusercontent.com/valcriss/trinitycore-docker/refs/heads/main/docker-compose.1120.yml
curl -o docker-compose.yml https://raw.githubusercontent.com/valcriss/trinitycore-docker/refs/heads/main/docker-compose.master.yml
mkdir client
```

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.1120.yml → docker-compose.dev.master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
trinitycore:
build:
context: .
dockerfile: Dockerfile.1120
dockerfile: Dockerfile.master
restart: unless-stopped
environment:
- PUBLIC_IP_ADDRESS=127.0.0.1
Expand Down Expand Up @@ -47,4 +47,4 @@ services:
timeout: 30s
retries: 3
volumes:
db_data:
db_data:
2 changes: 1 addition & 1 deletion docker-compose.1120.yml → docker-compose.master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
trinitycore-docker:
image: danielsilvestre37/trinitycore-docker:11.2.0
image: danielsilvestre37/trinitycore-docker:master
restart: unless-stopped
environment:
- PUBLIC_IP_ADDRESS=127.0.0.1
Expand Down
Loading
Loading