Skip to content

Commit

Permalink
Merge pull request #55 from udx/UDXI-424
Browse files Browse the repository at this point in the history
WIP
  • Loading branch information
fqjony authored Oct 21, 2024
2 parents 7140a67 + 5df3a30 commit c392cab
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 6 deletions.
41 changes: 41 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -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
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,16 @@ 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 && \
zip=3.0-13build1 \
unzip=6.0-28ubuntu4 \
nano=7.2-2build1 \
vim=2:9.1.0016-1ubuntu7.3 && \
ln -fs /usr/share/zoneinfo/$TZ /etc/localtime && \
dpkg-reconfigure --frontend noninteractive tzdata && \
apt-get clean && \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
11 changes: 8 additions & 3 deletions ci/git-version.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c392cab

Please sign in to comment.