Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file. This change
- [#7](https://github.com/practicalli/project-templates/issues/7) resolved multiple portal windows on refresh
- [#9](https://github.com/practicalli/project-templates/issues/9) update code examples in template with cljstyle fix

## 2023-04-21
### Changed
- docker compose template: fixed some typos preventing `docker-compose` from running

## 2023-04-20
### Changed
- make: lint task uses npx megalinter command (no manual install)
Expand Down
18 changes: 8 additions & 10 deletions resources/practicalli/application/root/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
# Examples of persistence with Postgres and mysql docker images
# and local data storage to facilitate data restoration

name: "{{top/ns}}-{{main/ns}}"

services:
# --- Clojure Service --- #
clojure-service:
Expand Down Expand Up @@ -52,19 +50,19 @@ services:
# POSTGRES_PASSWORD: "$DOCKER_POSTGRES_ROOT_PASSWORD"
# # Set User Credentials - optional
# POSTGRES_USER: "$DOCKER_POSTGRES_USER"
# POSTGRES_DB: "$DOCKER_POSTGRES_USER"
# POSTGRES_DB: "$DOCKER_POSTGRES_DB"
# healthcheck:
# test: [CMD-SHELL”, “pg_isready]
# interval : 1s
# timeout: 5s
# retries: 10
# # start_period: 10s
# test: ["CMD-SHELL", "pg_isready"]
# interval: 1s
# timeout: 5s
# retries: 10
# # start_period: 10s
# # Persist Postgres database schema in a docker volume
# volumes:
# - postgres-data:/var/lib/postgres/data

# postgres web-based administration tool
# posgres-adminer:
# postgres-adminer:
# image: adminer
# restart: always
# ports:
Expand All @@ -76,7 +74,7 @@ services:
# environment:
# MYSQL_USER: "$DOCKER_SERVICE_DB_USER"
# MYSQL_PASSWORD: "$DOCKER_SERVICE_DB_PASSWORD"
# MYSQL_DATABASE: "service"
# MYSQL_DATABASE: "$DOCKER_SERVICE_DB_DB"
# MYSQL_ROOT_PASSWORD: "$DOCKER_MYSQL_ROOT_PASSWORD"
# ports:
# - "3306:3306"
Expand Down
22 changes: 10 additions & 12 deletions resources/practicalli/service/root/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
# Examples of persistence with Postgres and mysql docker images
# and local data storage to facilitate data restoration

name: "{{top/ns}}-{{main/ns}}"

services:
# --- Clojure Service --- #
clojure-service:
Expand All @@ -26,8 +24,8 @@ services:
ports:
- 8080:8080
healthcheck:
test: ["CMD", "curl", "--fail", "http://localhost:8080"]
interval: 10s
test: ["CMD", "curl", "-f", "http://localhost:8080"]
interval: 1m00s
timeout: 10s
retries: 5
start_period: 7s
Expand All @@ -52,19 +50,19 @@ services:
# POSTGRES_PASSWORD: "$DOCKER_POSTGRES_ROOT_PASSWORD"
# # Set User Credentials - optional
# POSTGRES_USER: "$DOCKER_POSTGRES_USER"
# POSTGRES_DB: "$DOCKER_POSTGRES_USER"
# POSTGRES_DB: "$DOCKER_POSTGRES_DB"
# healthcheck:
# test: [CMD-SHELL”, “pg_isready]
# interval : 1s
# timeout: 5s
# retries: 10
# # start_period: 10s
# test: ["CMD-SHELL", "pg_isready"]
# interval: 1s
# timeout: 5s
# retries: 10
# # start_period: 10s
# # Persist Postgres database schema in a docker volume
# volumes:
# - postgres-data:/var/lib/postgres/data

# postgres web-based administration tool
# posgres-adminer:
# postgres-adminer:
# image: adminer
# restart: always
# ports:
Expand All @@ -76,7 +74,7 @@ services:
# environment:
# MYSQL_USER: "$DOCKER_SERVICE_DB_USER"
# MYSQL_PASSWORD: "$DOCKER_SERVICE_DB_PASSWORD"
# MYSQL_DATABASE: "service"
# MYSQL_DATABASE: "$DOCKER_SERVICE_DB_DB"
# MYSQL_ROOT_PASSWORD: "$DOCKER_MYSQL_ROOT_PASSWORD"
# ports:
# - "3306:3306"
Expand Down