From 1add1284fb334fb5de859f44fd007a5fa1089452 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 20 Jan 2025 01:47:18 +0000 Subject: [PATCH 1/3] Prepare 4.4.7 release base --- CHANGELOG.md | 11 +++++++++++ README.md | 2 +- app/config/version.json | 2 +- sonar-project.properties | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0bea69c..f1119330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,15 @@ # Changelog +## --- [4.4.7] - 2024/TBD +### New features +TBD +### Bug fixes +TBD +### Tweaks +TBD +### Lang +TBD +

+ ## --- [4.4.6] - 2024/01/20 ### Bug fixes - Fix traceback on stats page for data missing data.get ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/824)) diff --git a/README.md b/README.md index b350cf78..af8c3c33 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Crafty Logo](app/frontend/static/assets/images/logo_long.svg)](https://craftycontrol.com) -# Crafty Controller 4.4.6 +# Crafty Controller 4.4.7 > Python based Control Panel for your Minecraft Server ## What is Crafty Controller? diff --git a/app/config/version.json b/app/config/version.json index 96ab759d..8ea8648d 100644 --- a/app/config/version.json +++ b/app/config/version.json @@ -1,5 +1,5 @@ { "major": 4, "minor": 4, - "sub": 6 + "sub": 7 } diff --git a/sonar-project.properties b/sonar-project.properties index ba9f049f..0e4be5fa 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=crafty-controller # This is the name and version displayed in the SonarCloud UI. sonar.projectName=Crafty 4 -sonar.projectVersion=4.4.6 +sonar.projectVersion=4.4.7 sonar.python.version=3.9, 3.10, 3.11 sonar.exclusions=app/migrations/**, app/frontend/static/assets/vendors/** From 756aadd0cbd04b4a593268f8afc456c4a1b60b91 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 20 Jan 2025 13:07:56 +0000 Subject: [PATCH 2/3] Remove ubuntu user to replace with crafty user Needing to as shipped user in sudoers, creating dummy mail to save on error/warn in build --- Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8c16e3a3..0bf6b890 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,12 @@ ENV DEBIAN_FRONTEND="noninteractive" # Security Patch for CVE-2021-44228 ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true +# Remove shipped sudoer user (Required for Ubuntu 24.04 base) MR !826 # Create non-root user & required dirs -RUN useradd -g root -M crafty \ +RUN touch /var/mail/ubuntu \ + && chown ubuntu /var/mail/ubuntu \ + && userdel -r ubuntu \ + && useradd -g root -M crafty \ && mkdir /crafty \ && chown -R crafty:root /crafty From cb3554386a5621a624bd9b776a66bf73960d467d Mon Sep 17 00:00:00 2001 From: Zedifus Date: Mon, 20 Jan 2025 14:09:01 +0000 Subject: [PATCH 3/3] Update changelog !826 & Close changelog v4.4.7 Previous versions flagged --- CHANGELOG.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1119330..1e565d10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,19 @@ # Changelog -## --- [4.4.7] - 2024/TBD -### New features -TBD +## --- [4.4.7] - 2024/01/20 ### Bug fixes -TBD -### Tweaks -TBD -### Lang -TBD +- Docker Repair | Remove ubuntu user to replace with crafty user ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/826)) Resolves #521

## --- [4.4.6] - 2024/01/20 +## NOTE Version effected by non-root docker issue if you installed from this version see [RCA document](https://gitlab.com/crafty-controller/crafty-4/-/issues/521#:~:text=Users%20deploying%20after%204.4.4) + ### Bug fixes - Fix traceback on stats page for data missing data.get ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/824))

## --- [4.4.5] - 2024/01/19 +## NOTE Version effected by non-root docker issue if you installed from this version see [RCA document](https://gitlab.com/crafty-controller/crafty-4/-/issues/521#:~:text=Users%20deploying%20after%204.4.4) + ### Refactor - Refactor and standardize all JSON validator errors returning human readable translations ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/786)) - Improve docker-build CI/CD, supporting nightly builds ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/813))