From 5e38ebf3bb02001aba269adafa68d4e32d9ae1c8 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 5 May 2025 13:25:20 +0200 Subject: [PATCH] update admin Docker for development and production use --- .env.git | 3 + .gitignore | 1 - .husky/post-checkout | 7 --- .husky/pre-commit | 1 - admin/.dockerignore | 3 +- admin/Dockerfile | 31 ++++++++-- bun.lock | 5 +- docker-compose.override.yml | 109 +++++++----------------------------- docker-compose.yml | 75 +++++++------------------ nginx/Dockerfile | 9 ++- nginx/gradido.conf | 8 +-- package.json | 6 +- yarn.lock | 5 -- 13 files changed, 88 insertions(+), 175 deletions(-) create mode 100644 .env.git delete mode 100644 .husky/post-checkout delete mode 100644 .husky/pre-commit diff --git a/.env.git b/.env.git new file mode 100644 index 000000000..9146fae2d --- /dev/null +++ b/.env.git @@ -0,0 +1,3 @@ +BUILD_COMMIT=e7b1c19bc8a0d0ed73aeaa98283be3e47af47831 +BUILD_COMMIT_SHORT=e7b1c19bc +BUILD_VERSION=b2.3.1.1425-861-ge7b1c19bc diff --git a/.gitignore b/.gitignore index 68f604c8c..149d8d245 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ nbproject .metadata /out/* /.env -.env.git package-lock.json /deployment/bare_metal/.env /deployment/bare_metal/nginx/sites-available/gradido.conf diff --git a/.husky/post-checkout b/.husky/post-checkout deleted file mode 100644 index c7b7eeade..000000000 --- a/.husky/post-checkout +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -echo "Writing build metadata to .env.git" -cat > .env.git <=18" diff --git a/yarn.lock b/yarn.lock index cde6da2bc..22ac25cd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6858,11 +6858,6 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -husky@^9.1.7: - version "9.1.7" - resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d" - integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA== - hypercore-crypto@^3.3.0, hypercore-crypto@^3.3.1: version "3.6.0" resolved "https://registry.yarnpkg.com/hypercore-crypto/-/hypercore-crypto-3.6.0.tgz#6986cc4038339c4402282bbdf33a4fe2dea98db7"