Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

refactor: simplify Docker structure and rename entrypoints

Samuel BAGATTIN4f2ecff175ef
diff --git a/.idea/aws.xml b/.idea/aws.xml
new file mode 100644
index 00000000..b63b642c
--- /dev/null
+++ b/.idea/aws.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="accountSettings">
+ <option name="activeRegion" value="us-east-1" />
+ <option name="recentlyUsedRegions">
+ <list>
+ <option value="us-east-1" />
+ </list>
+ </option>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8285b2d4..489a112b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,22 +5,31 @@
</component>
<component name="ChangeListManager">
<list default="true" id="53a67efa-5191-4bc3-90c2-1af3195b648d" name="Changes" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/Alexandrie.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/Alexandrie.iml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/docker/backend/Dockerfile" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/docker/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/docker/frontend/Dockerfile" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/docker/frontend/entrypoint.sh" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <component name="ComposerSettings">
+ <execution />
+ </component>
<component name="GOROOT" url="file://$USER_HOME$/go/pkg/mod/golang.org/[email protected]" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
- <component name="ProjectColorInfo"><![CDATA[{
- "associatedIndex": 0
-}]]></component>
+ <component name="MacroExpansionManager">
+ <option name="directoryName" value="6CyHdZ9h" />
+ </component>
+ <component name="ProjectColorInfo">{
+ &quot;associatedIndex&quot;: 0
+}</component>
<component name="ProjectId" id="2wPtaVnbGBKWANObeSFbXmaZEPD" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
@@ -36,9 +45,10 @@
"RunOnceActivity.go.formatter.settings.were.checked": "true",
"RunOnceActivity.go.migrated.go.modules.settings": "true",
"RunOnceActivity.go.modules.go.list.on.any.changes.was.set": "true",
- "git-widget-placeholder": "main",
+ "git-widget-placeholder": "docker-improvements",
"go.import.settings.migrated": "true",
"last_opened_file_path": "/home/smaug",
+ "node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm"
}
}]]></component>
diff --git a/README.md b/README.md
index 9a3065a7..4f369b77 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,6 @@ Organize, search, and export your notes with an intuitive interface designed for
For local testing and development, you can use Docker to run the entire stack:
```bash
-cd docker
docker compose up -d --build
```
@@ -59,7 +58,6 @@ docker compose up -d --build
**To stop:**
```bash
-cd docker
docker compose down
```
diff --git a/docker/backend/Dockerfile b/backend/Dockerfile
similarity index 100%
rename from docker/backend/Dockerfile
rename to backend/Dockerfile
diff --git a/docker/docker-compose.yml b/docker-compose.yml
similarity index 94%
rename from docker/docker-compose.yml
rename to docker-compose.yml
index 562f71d4..32090bda 100644
--- a/docker/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,8 +46,7 @@ services:
# Alexandrie Backend
backend:
build:
- context: ../backend
- dockerfile: ../docker/backend/Dockerfile
+ context: ./backend
container_name: alexandrie-backend
environment:
# Database Configuration
@@ -91,8 +90,7 @@ services:
# Alexandrie Frontend
frontend:
build:
- context: ../frontend
- dockerfile: ../docker/frontend/Dockerfile
+ context: ./frontend
container_name: alexandrie-frontend
restart: unless-stopped
environment:
diff --git a/docker/frontend/Dockerfile b/frontend/Dockerfile
similarity index 88%
rename from docker/frontend/Dockerfile
rename to frontend/Dockerfile
index 32f5f8ba..dded0206 100644
--- a/docker/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -21,10 +21,10 @@ RUN bun install
COPY . .
# Copy entrypoint script
-COPY ../docker/frontend/entrypoint.sh /app/entrypoint.sh
+COPY docker-entrypoint.sh /app/docker-entrypoint.sh
# Make script executable and change ownership to app user
-RUN chmod +x /app/entrypoint.sh && \
+RUN chmod +x /app/docker-entrypoint.sh && \
chown -R appuser:appgroup /app
# Switch to app user
@@ -45,4 +45,4 @@ ENV VITE_BASE_CDN=""
ENV NUXT_PUBLIC_BASE_URL=""
# Use entrypoint script
-ENTRYPOINT ["/app/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/app/docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/docker/frontend/entrypoint.sh b/frontend/docker-entrypoint.sh
similarity index 100%
rename from docker/frontend/entrypoint.sh
rename to frontend/docker-entrypoint.sh