From a0cf7ecc98cc746af06c4a81bf67a89b0ce6337a Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 16 May 2024 00:05:59 +0200 Subject: [PATCH 1/4] moved file to dev-specific naming-scheme --- docker-compose.yml => dev.docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yml => dev.docker-compose.yml (100%) diff --git a/docker-compose.yml b/dev.docker-compose.yml similarity index 100% rename from docker-compose.yml rename to dev.docker-compose.yml From 4459483862b37e997f735e494644d680af8ee39f Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 16 May 2024 01:06:47 +0200 Subject: [PATCH 2/4] moved env. to own dev-file --- .env.docker => .env.dev.docker | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .env.docker => .env.dev.docker (100%) diff --git a/.env.docker b/.env.dev.docker similarity index 100% rename from .env.docker rename to .env.dev.docker From 1b85eea28e3afa7fb6b3c7c2ac4876d967a3a836 Mon Sep 17 00:00:00 2001 From: Phil Date: Thu, 16 May 2024 02:13:31 +0200 Subject: [PATCH 3/4] added new compose and env files --- .env.docker | 171 +++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 34 +++++++++ 2 files changed, 205 insertions(+) create mode 100644 .env.docker create mode 100644 docker-compose.yml diff --git a/.env.docker b/.env.docker new file mode 100644 index 0000000000..2adbe44b0f --- /dev/null +++ b/.env.docker @@ -0,0 +1,171 @@ +# -------------------------------------------- +# REQUIRED: DOCKER SPECIFIC SETTINGS +# -------------------------------------------- +APP_VERSION=v6.4.1 +APP_PORT=8000 + +# -------------------------------------------- +# REQUIRED: BASIC APP SETTINGS +# -------------------------------------------- +APP_ENV=production +APP_DEBUG=false +# Please regenerate the APP_KEY value by calling `docker compose run --rm snipeit php artisan key:generate --show`. Copy paste the value here +APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ= +APP_URL=http://localhost:8000 +# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones - TZ identifier +APP_TIMEZONE='UTC' +APP_LOCALE=en +MAX_RESULTS=500 + +# -------------------------------------------- +# REQUIRED: UPLOADED FILE STORAGE SETTINGS +# -------------------------------------------- +PRIVATE_FILESYSTEM_DISK=local +PUBLIC_FILESYSTEM_DISK=local_public + +# -------------------------------------------- +# REQUIRED: DATABASE SETTINGS +# -------------------------------------------- +DB_CONNECTION=mysql +DB_HOST=db +DB_DATABASE=snipeit +DB_USERNAME=snipeit +DB_PASSWORD=changeme1234 +MYSQL_ROOT_PASSWORD=changeme1234 +DB_PREFIX=null +DB_DUMP_PATH='/usr/bin' +DB_CHARSET=utf8mb4 +DB_COLLATION=utf8mb4_unicode_ci + +# -------------------------------------------- +# OPTIONAL: SSL DATABASE SETTINGS +# -------------------------------------------- +DB_SSL=false +DB_SSL_IS_PAAS=false +DB_SSL_KEY_PATH=null +DB_SSL_CERT_PATH=null +DB_SSL_CA_PATH=null +DB_SSL_CIPHER=null +DB_SSL_VERIFY_SERVER=null + +# -------------------------------------------- +# REQUIRED: OUTGOING MAIL SERVER SETTINGS +# -------------------------------------------- +MAIL_DRIVER=smtp +MAIL_HOST=mailhog +MAIL_PORT=1025 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDR=you@example.com +MAIL_FROM_NAME='Snipe-IT' +MAIL_REPLYTO_ADDR=you@example.com +MAIL_REPLYTO_NAME='Snipe-IT' +MAIL_AUTO_EMBED_METHOD='attachment' + +# -------------------------------------------- +# REQUIRED: DATA PROTECTION +# -------------------------------------------- +ALLOW_BACKUP_DELETE=false +ALLOW_DATA_PURGE=false + +# -------------------------------------------- +# REQUIRED: IMAGE LIBRARY +# This should be gd or imagick +# -------------------------------------------- +IMAGE_LIB=gd + +# -------------------------------------------- +# OPTIONAL: BACKUP SETTINGS +# -------------------------------------------- +MAIL_BACKUP_NOTIFICATION_DRIVER=null +MAIL_BACKUP_NOTIFICATION_ADDRESS=null +BACKUP_ENV=true + +# -------------------------------------------- +# OPTIONAL: SESSION SETTINGS +# -------------------------------------------- +SESSION_LIFETIME=12000 +EXPIRE_ON_CLOSE=false +ENCRYPT=false +COOKIE_NAME=snipeit_session +COOKIE_DOMAIN=null +SECURE_COOKIES=false +API_TOKEN_EXPIRATION_YEARS=40 + +# -------------------------------------------- +# OPTIONAL: SECURITY HEADER SETTINGS +# -------------------------------------------- +APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1,172.0.0.0/8 +ALLOW_IFRAMING=false +REFERRER_POLICY=same-origin +ENABLE_CSP=false +CORS_ALLOWED_ORIGINS=null +ENABLE_HSTS=false + +# -------------------------------------------- +# OPTIONAL: CACHE SETTINGS +# -------------------------------------------- +CACHE_DRIVER=file +SESSION_DRIVER=file +QUEUE_DRIVER=sync +CACHE_PREFIX=snipeit + +# -------------------------------------------- +# OPTIONAL: REDIS SETTINGS +# -------------------------------------------- +REDIS_HOST=null +REDIS_PASSWORD=null +REDIS_PORT=6379 + +# -------------------------------------------- +# OPTIONAL: MEMCACHED SETTINGS +# -------------------------------------------- +MEMCACHED_HOST=null +MEMCACHED_PORT=null + +# -------------------------------------------- +# OPTIONAL: PUBLIC S3 Settings +# -------------------------------------------- +PUBLIC_AWS_SECRET_ACCESS_KEY=null +PUBLIC_AWS_ACCESS_KEY_ID=null +PUBLIC_AWS_DEFAULT_REGION=null +PUBLIC_AWS_BUCKET=null +PUBLIC_AWS_URL=null +PUBLIC_AWS_BUCKET_ROOT=null + +# -------------------------------------------- +# OPTIONAL: PRIVATE S3 Settings +# -------------------------------------------- +PRIVATE_AWS_ACCESS_KEY_ID=null +PRIVATE_AWS_SECRET_ACCESS_KEY=null +PRIVATE_AWS_DEFAULT_REGION=null +PRIVATE_AWS_BUCKET=null +PRIVATE_AWS_URL=null +PRIVATE_AWS_BUCKET_ROOT=null + +# -------------------------------------------- +# OPTIONAL: AWS Settings +# -------------------------------------------- +AWS_ACCESS_KEY_ID=null +AWS_SECRET_ACCESS_KEY=null +AWS_DEFAULT_REGION=null + +# -------------------------------------------- +# OPTIONAL: LOGIN THROTTLING +# -------------------------------------------- +LOGIN_MAX_ATTEMPTS=5 +LOGIN_LOCKOUT_DURATION=60 +RESET_PASSWORD_LINK_EXPIRES=900 + +# -------------------------------------------- +# OPTIONAL: MISC +# -------------------------------------------- +LOG_CHANNEL=stderr +LOG_MAX_DAYS=10 +APP_LOCKED=false +APP_CIPHER=AES-256-CBC +APP_FORCE_TLS=false +GOOGLE_MAPS_API= +LDAP_MEM_LIM=500M +LDAP_TIME_LIM=600 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..c7c1983a4e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,34 @@ +volumes: + db_data: + storage: + +services: + app: + image: snipe/snipe-it:${APP_VERSION:-v6.4.1} + restart: always + volumes: + - storage:/var/lib/snipeit + ports: + - "${APP_PORT:-8000}:80" + depends_on: + db: + condition: service_healthy + restart: true + env_file: + - .env + + db: + image: mariadb:10.6.4-focal + restart: always + volumes: + - db_data:/var/lib/mysql + environment: + MYSQL_DATABASE: ${DB_DATABASE} + MYSQL_USER: ${DB_USERNAME} + MYSQL_PASSWORD: ${DB_PASSWORD} + MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} + healthcheck: + test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD + interval: 5s + timeout: 1s + retries: 5 From 217ed03b8e05c7f1f1db81eacfc8b72278434182 Mon Sep 17 00:00:00 2001 From: Phil Date: Fri, 7 Jun 2024 12:04:10 +0200 Subject: [PATCH 4/4] add DB_PORT --- .env.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.docker b/.env.docker index 2adbe44b0f..535bb3b42a 100644 --- a/.env.docker +++ b/.env.docker @@ -28,6 +28,7 @@ PUBLIC_FILESYSTEM_DISK=local_public # -------------------------------------------- DB_CONNECTION=mysql DB_HOST=db +DB_PORT='3306' DB_DATABASE=snipeit DB_USERNAME=snipeit DB_PASSWORD=changeme1234