Next release (#27)

Reviewed-on: #27

.dockerignore.yaml

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

.env.docker.sample

@@ -1,6 +0,0 @@
-SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-POSTGRES_AUTH_USER=icarus_op
-POSTGRES_AUTH_PASSWORD=password
-POSTGRES_AUTH_DB=icarus_auth_db
-POSTGRES_AUTH_HOST=auth_db
-DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}

.env.sample

@@ -1,6 +1,2 @@
-SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h
-POSTGRES_AUTH_USER=icarus_op_test
-POSTGRES_AUTH_PASSWORD=password
-POSTGRES_AUTH_DB=icarus_auth_test_db
-POSTGRES_AUTH_HOST=localhost
-DATABASE_URL=postgresql://${POSTGRES_AUTH_USER}:${POSTGRES_AUTH_PASSWORD}@${POSTGRES_AUTH_HOST}:5432/${POSTGRES_AUTH_DB}
+DATABASE_URL=postgres://username:password@localhost/database_name
+SECRET_KEY=refero34o8rfhfjn983thf39fhc943rf923n3h

Dockerfile

@@ -34,6 +34,8 @@ 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
 
@@ -62,6 +64,8 @@ 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

README.md

@@ -1,26 +0,0 @@
-
-
-# Getting Started
-Copy the `.env.sample` file to `.env` and ensure that the variables are populated. This project
-can be used with regular hosting or with docker. For the sake of getting up to speed quickly,
-Docker will be covered. Make sure docker is running and your ssh identity has been loaded.
-
-Build image
-```
-docker compose build
-```
-
-Start images
-```
-docker compose up -d --force-recreate
-```
-
-Bring it down
-```
-docker compose down -v
-```
-
-Pruning
-```
-docker system prune -a
-```

docker-compose.yaml

@@ -2,34 +2,43 @@ version: '3.8' # Use a recent version
 
 services:
   # Your Rust Application Service
-  auth_api:
-    build: # Tells docker-compose to build the Dockerfile in the current directory
-      context: .
-      ssh: ["default"]  # Uses host's SSH agent
+  app:
+    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"
-    env_file:
-      - .env
+    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
     depends_on:
-      auth_db:
+      db:
         condition: service_healthy # Wait for the DB to be healthy before starting the app
     restart: unless-stopped # Optional: Restart policy
 
   # PostgreSQL Database Service
-  auth_db:
+  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: ${POSTGRES_AUTH_USER:-icarus_op}
-      POSTGRES_PASSWORD: ${POSTGRES_AUTH_PASSWORD:-password}
-      POSTGRES_DB: ${POSTGRES_AUTH_DB:-icarus_auth_db}
+      POSTGRES_USER: icarus_op
+      POSTGRES_PASSWORD: password
+      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"]
@@ -42,4 +51,4 @@ services:
 # Define the named volume for data persistence
 volumes:
   postgres_data:
-    driver: local # Use the default local driver
+    driver: local # Use the default local driver

docker_run.txt

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

src/lib.rs

@@ -36,6 +36,7 @@ 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)
     }
 

src/main.rs

@@ -74,7 +74,6 @@ mod tests {
         pub const LIMIT: usize = 6;
 
         pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
-            dotenvy::dotenv().ok(); // Load .env file if it exists
             let tm_db_url = std::env::var(keys::DBURL).expect("DATABASE_URL must be present");
             let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap();
             sqlx::PgPool::connect_with(tm_options).await