From 62a66cea0161cd406ae912a972216d0491951d6a Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 8 Oct 2024 12:25:59 +0300 Subject: [PATCH 1/5] installed useful tooling packages --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 86fb729b..cb42b68e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,14 @@ RUN apt-get update && \ tzdata=2024a-3ubuntu1.1 \ curl=8.5.0-2ubuntu10.4 \ bash=5.2.21-2ubuntu4 \ + apt-utils=2.7.14build2 \ gettext=0.21-14ubuntu2 \ gnupg=2.4.4-2ubuntu17 \ ca-certificates=20240203 \ lsb-release=12.0-2 \ jq=1.7.1-3build1 \ - unzip=6.0-28ubuntu4 && \ + unzip=6.0-28ubuntu4 \ + vim=2:9.1.0016-1ubuntu7.3 && \ ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata && \ apt-get clean && \ From f29dab0054b4700a826d78a9a2904c540b3cb96a Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 8 Oct 2024 12:26:15 +0300 Subject: [PATCH 2/5] git-version config improvements --- Dockerfile | 1 + ci/git-version.yml | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb42b68e..1749dbe2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get update && \ ca-certificates=20240203 \ lsb-release=12.0-2 \ jq=1.7.1-3build1 \ + zip=3.0-13build1 \ unzip=6.0-28ubuntu4 \ vim=2:9.1.0016-1ubuntu7.3 && \ ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \ diff --git a/ci/git-version.yml b/ci/git-version.yml index 4229126b..13bee63e 100644 --- a/ci/git-version.yml +++ b/ci/git-version.yml @@ -1,10 +1,15 @@ mode: ContinuousDeployment + branches: release: regex: ^latest$ tag: "" increment: Minor + develop: - regex: ^(?!latest).*$ - tag: "beta" - increment: Minor + regex: ^(?!latest).* # All non-latest branches + tag: beta + increment: Patch + +assembly-versioning-scheme: MajorMinorPatch +continuous-delivery-fallback-tag: ci From f62bfc197ebafc138d06952b3df2fe260e8cda3e Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 14 Oct 2024 13:46:02 +0300 Subject: [PATCH 3/5] added nano --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 1749dbe2..ce9187b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,7 @@ RUN apt-get update && \ jq=1.7.1-3build1 \ zip=3.0-13build1 \ unzip=6.0-28ubuntu4 \ + nano \ vim=2:9.1.0016-1ubuntu7.3 && \ ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata && \ From ef1797a4f0a8f2ffa7ed6e80ddd6c1918b4784bb Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 14 Oct 2024 14:12:42 +0300 Subject: [PATCH 4/5] set nano version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce9187b2..5fc7db0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ RUN apt-get update && \ jq=1.7.1-3build1 \ zip=3.0-13build1 \ unzip=6.0-28ubuntu4 \ - nano \ + nano=7.2-2build1 \ vim=2:9.1.0016-1ubuntu7.3 && \ ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \ dpkg-reconfigure --frontend noninteractive tzdata && \ From 5df3a3026966376f51d8272631d81ca839c3bf1d Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 15 Oct 2024 16:19:24 +0300 Subject: [PATCH 5/5] added .dockerignore --- .dockerignore | 41 +++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..af1a0267 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,41 @@ +# Ignore credentials and sensitive data +azure_creds.json +aws_creds.json +gcp_creds.json +bitwarden_creds.json + +# Ignore Git and version control related files +.git +.gitignore +.gitattributes + +# Ignore CI/CD and GitHub-related files +ci/* +.github/* + +# Ignore documentation files +docs/* +README.md +SECURITY.md + +# Ignore local development scripts and helper files +Makefile +Makefile.help +Makefile.variables + +# Ignore build artifacts and temporary files +*.log +*.tmp +*.swp +*.bak +*.old + +# Ignore unnecessary configuration or text files +etc/home/logo.txt + +# Ignore readme files in the secrets and auth directories +lib/auth/readme.md +lib/secrets/readme.md + +# Ignore unnecessary configuration documentation +src/configs/readme.md diff --git a/Makefile b/Makefile index 2c71a538..cd61db98 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ MULTIPLATFORM ?= false build: @echo "Building Docker image..." @if [ "$(MULTIPLATFORM)" = "true" ]; then \ - echo "Building Docker image for multiple platforms..."; \ + echo "Multiple platforms: [linux/amd64, linux/arm64]..."; \ docker buildx build --platform linux/amd64,linux/arm64 -t $(DOCKER_IMAGE) .; \ else \ - echo "Building Docker image for the local platform..."; \ + echo "Only local platform..."; \ docker build -t $(DOCKER_IMAGE) .; \ fi @echo "Docker image build completed."