Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bigbeartechworld/big-bear-runtipi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 32242ebb497e0e91a79927bcdb8cbc52cd74314d
Choose a base ref
..
head repository: bigbeartechworld/big-bear-runtipi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae7568c8f1c54d2281ce3c6258f59fae209fd4d8
Choose a head ref
Showing with 57 additions and 40 deletions.
  1. +2 −7 apps/2fauth/config.json
  2. +17 −13 apps/2fauth/docker-compose.yml
  3. +3 −8 apps/planka/config.json
  4. +28 −8 apps/planka/docker-compose.yml
  5. +6 −3 apps/plausible/config.json
  6. +1 −1 apps/plausible/docker-compose.yml
9 changes: 2 additions & 7 deletions apps/2fauth/config.json
Original file line number Diff line number Diff line change
@@ -9,17 +9,12 @@
"id": "2fauth",
"tipi_version": 15,
"version": "5.1.1",
"categories": [
"security"
],
"categories": ["security"],
"description": "A Web app to manage your Two-Factor Authentication (2FA) accounts and generate their security codes.",
"short_desc": "Manage your Two-Factor Authentication codes.",
"author": "Bubka",
"source": "https://github.com/Bubka/2FAuth",
"website": "https://docs.2fauth.app/",
"form_fields": [],
"supported_architectures": [
"arm64",
"amd64"
]
"supported_architectures": ["arm64", "amd64"]
}
30 changes: 17 additions & 13 deletions apps/2fauth/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
services:
2fauth:
image: 2fauth/2fauth:5.1.1
container_name: 2fauth
image: 2fauth/2fauth:5.1.1 # Specifies the Docker image and version to use for 2FAuth
container_name: 2fauth # Sets the name of the container
volumes:
- ${APP_DATA_DIR}/data:/2fauth
- ${APP_DATA_DIR}/data:/2fauth # Mounts the volume for persistent data storage
ports:
- ${APP_PORT}:8000
- ${APP_PORT}:8000 # Maps the port for accessing 2FAuth from the host
environment:
- ASSET_URL=https://${APP_DOMAIN}
- APP_URL=https://${APP_DOMAIN}
- ASSET_URL=http://${APP_DOMAIN} # Environment variable for assets URL
- APP_URL=http://${APP_DOMAIN} # Environment variable for application URL
networks:
- tipi_main_network
- tipi_main_network # Connects the container to the specified network
labels:
# Main
# Main Traefik settings for enabling the service and defining the load balancer port
traefik.enable: true
traefik.http.middlewares.2fauth-web-redirect.redirectscheme.scheme: https
traefik.http.services.2fauth.loadbalancer.server.port: 8000
# Web

# Web router configuration for HTTP, redirects to HTTPS
traefik.http.routers.2fauth-insecure.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.2fauth-insecure.entrypoints: web
traefik.http.routers.2fauth-insecure.service: 2fauth
traefik.http.routers.2fauth-insecure.middlewares: 2fauth-web-redirect
# Websecure

# Websecure router configuration for HTTPS
traefik.http.routers.2fauth.rule: Host(`${APP_DOMAIN}`)
traefik.http.routers.2fauth.entrypoints: websecure
traefik.http.routers.2fauth.service: 2fauth
traefik.http.routers.2fauth.tls.certresolver: myresolver
# Local domain

# Local domain router for HTTP, useful for internal access without HTTPS
traefik.http.routers.2fauth-local-insecure.rule: Host(`2fauth.${LOCAL_DOMAIN}`)
traefik.http.routers.2fauth-local-insecure.entrypoints: web
traefik.http.routers.2fauth-local-insecure.service: 2fauth
traefik.http.routers.2fauth-local-insecure.middlewares: 2fauth-web-redirect
# Local domain secure

# Local domain secure router for HTTPS
traefik.http.routers.2fauth-local.rule: Host(`2fauth.${LOCAL_DOMAIN}`)
traefik.http.routers.2fauth-local.entrypoints: websecure
traefik.http.routers.2fauth-local.service: 2fauth
traefik.http.routers.2fauth-local.tls: true
traefik.http.routers.2fauth-local.tls: true # Enables TLS for the local domain
11 changes: 3 additions & 8 deletions apps/planka/config.json
Original file line number Diff line number Diff line change
@@ -6,10 +6,8 @@
"exposable": true,
"id": "planka",
"tipi_version": 20,
"version": "1.17.1",
"categories": [
"development"
],
"version": "1.17.2",
"categories": ["development"],
"description": "The realtime kanban board for workgroups built with React and Redux.",
"short_desc": "Free open source kanban board for workgroups.",
"author": "Planka",
@@ -23,8 +21,5 @@
"env_variable": "PLANKA_SECRET_KEY"
}
],
"supported_architectures": [
"arm64",
"amd64"
]
"supported_architectures": ["arm64", "amd64"]
}
36 changes: 28 additions & 8 deletions apps/planka/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3'
version: "3"

services:
planka:
image: ghcr.io/plankanban/planka:1.17.1
image: ghcr.io/plankanban/planka:1.17.2
container_name: planka
command: >
bash -c
@@ -22,7 +22,7 @@ services:
environment:
- BASE_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
- TRUST_PROXY=1
- DATABASE_URL="postgresql://postgres@postgres/planka"
- DATABASE_URL=postgresql://postgres@big-bear-planka-postgres/planka
- SECRET_KEY="${PLANKA_SECRET_KEY}"
networks:
- tipi_main_network
@@ -51,17 +51,37 @@ services:
traefik.http.routers.planka-local.entrypoints: websecure
traefik.http.routers.planka-local.service: planka
traefik.http.routers.planka-local.tls: true
# Dependency on another service, ensuring it is healthy before starting
depends_on:
- postgres
big-bear-planka-postgres:
condition: service_healthy

postgres:
big-bear-planka-postgres:
image: postgres:14-alpine
container_name: planka-db
container_name: big-bear-planka-postgres
restart: unless-stopped
volumes:
- ${APP_DATA_DIR}/data/postgres:/var/lib/postgresql/data
environment:
POSTGRES_DB: "planka"
POSTGRES_HOST_AUTH_METHOD: "trust"
# Sets the default database that is created when the container starts
- POSTGRES_DB=planka
# Configures the authentication method for connections from the host
# Setting to 'trust' allows connections without a password
# Note: This setting is not recommended for production environments due to security concerns
- POSTGRES_HOST_AUTH_METHOD=trust
networks:
- tipi_main_network
# Healthcheck configuration to ensure the database service is running properly
# Runs a command inside the container at specified intervals to check the health of the service
healthcheck:
# Command to check if PostgreSQL is ready to accept connections
# Uses `pg_isready` tool with the default 'postgres' user and the 'planka' database
test: ["CMD-SHELL", "pg_isready -U postgres -d planka"]
# The interval between running the healthcheck command
# Here, it's set to run every 10 seconds
interval: 10s
# The timeout duration for the healthcheck command
# If the command does not complete within 5 seconds, the healthcheck is considered failed
timeout: 5s
# Number of consecutive failures needed to consider the service as unhealthy
retries: 5
9 changes: 6 additions & 3 deletions apps/plausible/config.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
"available": true,
"exposable": true,
"id": "plausible",
"tipi_version": 3,
"version": "v1.5.1",
"tipi_version": 4,
"version": "1.5.1",
"categories": [
"utilities"
],
@@ -35,5 +35,8 @@
"env_variable": "PLAUSIBLE_DISABLE_REGISTRATION"
}
],
"supported_architectures": ["arm64", "amd64"]
"supported_architectures": [
"arm64",
"amd64"
]
}
2 changes: 1 addition & 1 deletion apps/plausible/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ services:

plausible-events-db:
container_name: plausible-events-db
image: clickhouse/clickhouse-server:22.12-alpine
image: clickhouse/clickhouse-server:24.3-alpine
restart: always
networks:
- tipi_main_network