Skip to content

Commit

Permalink
Merge branch 'dev' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
JoCat committed Oct 8, 2024
2 parents 231da3b + 26ab129 commit fbf4900
Show file tree
Hide file tree
Showing 90 changed files with 14,856 additions and 262 deletions.
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
**/.dockerignore
**/.git
**/.gitignore
**/.vscode
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/dist
.github
LICENSE
README.md
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
run: echo "PACKAGE_VERSION=v$(node -p "require('./packages/server/package.json').version")" >> $GITHUB_ENV

- name: Download dependencies
run: npm i
run: npm ci

- name: Build LauncherServer
- name: Build Libraries
run: |
npm run build:libs
npm run build:prod -w packages/server
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Get version value, set to env
run: echo "PACKAGE_VERSION=v$(node -p "require('./packages/server/package.json').version")" >> $GITHUB_ENV

- name: Download dependencies
run: npm i
run: npm ci

- name: Build LauncherServer
- name: Build Libraries
run: |
npm run build:libs
npm run build:prod -w packages/server
npm run build:bin -w packages/server
- name: Upload release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
tag_name: ${{ env.PACKAGE_VERSION }}
name: Aurora LauncherServer ${{ env.PACKAGE_VERSION }}
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules
.idea
.fleet
package-lock.json
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Changelog

Все заметные изменения в этом проекте будут задокументированы в этом файле.

Формат основан на [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
данный проект придерживается [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Добавлено

- Добавлен параметр игнорирования добавления библиотеки в classpath для профилей
- Связь лаунчера с лаунчсервером
- Минификация/обфускация лаунчера

### Исправлено

- Исправление ошибки отдачи файлов с пробелами в названии
- Исправление алгоритма постороения функции хеширования в DatabasePasswordProvider

## [0.0.4] - 2024-02-23

## [0.0.3] - 2022-08-10

## [0.0.2] - 2021-07-11

## [0.0.1] - 2021-02-27

[unreleased]: https://github.com/AuroraTeam/AuroraLauncher/compare/v0.0.4...dev
[0.0.4]: https://github.com/AuroraTeam/AuroraLauncher/compare/v0.0.3...v0.0.4
[0.0.3]: https://github.com/AuroraTeam/AuroraLauncher/compare/v0.0.2...v0.0.3
[0.0.2]: https://github.com/AuroraTeam/AuroraLauncher/compare/v0.0.1...v0.0.2
[0.0.1]: https://github.com/AuroraTeam/AuroraLauncher/releases/tag/v0.0.1
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM node:20.12.2-slim AS build
WORKDIR /build
COPY . .
RUN npm i &&\
npm run build:libs &&\
npm run build:prod -w packages/server

FROM node:20.12.2-slim AS prod
EXPOSE 1370/tcp
VOLUME [ "/data" ]
ENV AURORA_STORAGE_OVERRIDE=/data
WORKDIR /app
COPY --from=build /build/packages/server/dist/LauncherServer.js .

ENTRYPOINT ["node", "LauncherServer.js"]
16 changes: 16 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: '3'
services:
launcher:
build:
context: .
dockerfile: Dockerfile
ports:
- "1370:1370"
volumes:
- data:/data
# environment:
# - AURORA_IS_DEBUG=true
# - AURORA_IS_DEV=true

volumes:
data:
Loading

0 comments on commit fbf4900

Please sign in to comment.