Docker changes (#31)

Reviewed-on: #31
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.dockerignore.yaml

@@ -5,6 +5,8 @@ pkg/
 # Ignore git directory
 .git/
 
+.gitea/
+
 # Ignore environment files (configure via docker-compose instead)
 .env*
 

.env.sample

@@ -1,2 +1,6 @@
-DATABASE_URL=postgres://username:password@localhost/database_name
-SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
+SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
+POSTGRES_USER=icarus_op_test
+POSTGRES_PASSWORD=password
+POSTGRES_DB=icarus_auth_test_db
+POSTGRES_HOST=localhost
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}

.gitea/workflows/tag_release.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - devel
-    tags:
-      - 'v*' # Trigger on tags matching v*
 
 jobs:
   release:
@@ -52,6 +50,4 @@ jobs:
           body: |
            Release of version ${{ steps.version.outputs.project_tag_release }}
           # draft: false
-          # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag
-
-
+          # prerelease: ${{ startsWith(github.ref, 'v') == false }} # prerelease if not a valid release tag

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "icarus_auth"
-version = "0.3.2"
+version = "0.3.4"
 edition = "2024"
 rust-version = "1.86"
 

Dockerfile

@@ -34,8 +34,6 @@ RUN --mount=type=ssh mkdir src && \
 # Copy the actual source code
 COPY src ./src
 # If you have other directories like `templates` or `static`, copy them too
-# COPY templates ./templates
-# COPY static ./static
 COPY .env ./.env
 COPY migrations ./migrations
 
@@ -64,8 +62,6 @@ COPY --from=builder /usr/src/app/target/release/icarus_auth .
 # It's generally better to configure via environment variables in Docker though
 COPY --from=builder /usr/src/app/.env .
 COPY --from=builder /usr/src/app/migrations ./migrations
-# COPY --from=builder /usr/src/app/templates ./templates
-# COPY --from=builder /usr/src/app/static ./static
 
 # Expose the port your Axum app listens on (e.g., 3000 or 8000)
 EXPOSE 3000

READEME.md

@@ -0,0 +1,20 @@
+
+
+# Getting started
+Take notice of the .env.sample file and create copies without the .sample in the name.
+
+`.env.sample` -> `.env`
+
+Ensure that all variables are populated and is correct.
+
+## Docker
+
+Build the images
+```
+docker compose build --ssh default auth_api
+```
+
+Bring it up
+```
+docker compose up -d --force-recreate auth_api
+```

docker-compose.yaml

@@ -2,43 +2,32 @@ version: '3.8' # Use a recent version
 
 services:
   # Your Rust Application Service
-  app:
+  auth_api:
     build: . # Tells docker-compose to build the Dockerfile in the current directory
     container_name: icarus_auth # Optional: Give the container a specific name
     ports:
       # Map host port 8000 to container port 3000 (adjust as needed)
-      # Format: "HOST_PORT:CONTAINER_PORT"
       - "8000:3000"
-    environment:
-      # Pass environment variables to your Rust application
-      # RUST_LOG: info # Example: Set log level
-      # IMPORTANT: Configure DATABASE_URL to connect to the 'db' service
-      # The hostname 'db' matches the service name defined below.
-      DATABASE_URL: postgresql://icarus_op:password@db:5432/icarus_auth
-      # Add any other environment variables your app needs
-      # APP_HOST: 0.0.0.0
-      # APP_PORT: 3000
+    env_file:
+      - .env
     depends_on:
-      db:
+      auth_db:
         condition: service_healthy # Wait for the DB to be healthy before starting the app
     restart: unless-stopped # Optional: Restart policy
 
   # PostgreSQL Database Service
-  db:
+  auth_db:
     image: postgres:17.4-alpine # Use an official Postgres image (Alpine variant is smaller)
     container_name: icarus_auth_db # Optional: Give the container a specific name
     environment:
       # These MUST match the user, password, and database name in the DATABASE_URL above
-      POSTGRES_USER: icarus_op
-      POSTGRES_PASSWORD: password
-      POSTGRES_DB: icarus_auth
+      POSTGRES_USER: ${POSTGRES_USER:-icarus_op}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
+      POSTGRES_DB: ${POSTGRES_DB:-icarus_auth}
     volumes:
       # Persist database data using a named volume
       - postgres_data:/var/lib/postgresql/data
     ports: []
-      # Optional: Expose port 5432 ONLY if you need to connect directly from your host machine (e.g., for debugging)
-      # - "5432:5432"
-      # pass:
     healthcheck:
         # Checks if Postgres is ready to accept connections
         test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]

docker_run.txt

@@ -1,13 +1,13 @@
 
 # Docker stuff
 #Build app
-docker-compose build --ssh default app
+docker compose build --ssh default auth_api
 
 # Rebuild and bring up
-docker-compose up -d --force-recreate app
+docker compose up -d --force-recreate auth_api
 
 # Bring it down
-docker-compose down -v
+docker compose down -v
 
 # Pruning
 docker system prune -a

src/lib.rs

@@ -36,7 +36,6 @@ pub mod db {
     async fn get_db_url() -> String {
         #[cfg(debug_assertions)] // Example: Only load .env in debug builds
         dotenvy::dotenv().ok();
-
         env::var(keys::DBURL).expect(keys::error::ERROR)
     }