Compare commits

..

5 Commits

Author SHA1 Message Date
65c76f225b feat: add strapi cms 2025-05-16 17:03:26 +00:00
15d4cd5b9b chore: start database and directus services 2025-03-07 14:03:33 +00:00
b775bd366e chore(directus): improve definition
* Use latest version
* Configure `postgres` and `valkey` services
2025-03-07 14:02:29 +00:00
7fab4e4072 chore(database): add postgres and valkey services
These are used by `strapi` and `directus` to store data.
2025-03-07 13:59:33 +00:00
1ad7e94ea1 chore: add common configuration for the project
Set `editorconfig` pattern and files/paths to be ignored by `git` and
`docker`.

Finally, define runtimes needed by the project using `mise`.
2025-03-07 13:58:33 +00:00
11 changed files with 219 additions and 78 deletions

2
.dockerignore Normal file
View File

@@ -0,0 +1,2 @@
**/node_modules
**/.next

41
.editorconfig Normal file
View File

@@ -0,0 +1,41 @@
root = true
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 2
[*.{ts,tsx,js,jsx,json}]
indent_style = space
indent_size = 2
[*.md]
trim_trailing_whitespace = false
indent_size = 2
[{Dockerfile,docker-compose.yml,docker-compose.*.yml,compose.yml,compose.*.yml}]
indent_style = space
indent_size = 2
[*.{yml,yaml}]
indent_style = space
indent_size = 2
[*.sh]
end_of_line = lf
indent_style = space
indent_size = 2
[package.json]
indent_style = space
indent_size = 2
[*.{xml,config,conf}]
indent_style = space
indent_size = 2
[Makefile]
indent_style = tab

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
**/node_modules
**/.next

View File

@@ -0,0 +1,7 @@
---
name: ${CMS_PROJECT_NAME:-cms}
include:
- services/database/compose.yml
- services/directus/compose.yml
- services/strapi/compose.yml

3
mise.toml Normal file
View File

@@ -0,0 +1,3 @@
[tools]
node = "18.20.7"
yarn = "1.22.22"

View File

@@ -0,0 +1,48 @@
---
services:
postgres:
image: 'postgres:17.4-bookworm'
hostname: ${CMS_POSTGRES_HOST:-postgres}
init: true
restart: unless-stopped
healthcheck:
test:
- CMD-SHELL
- pg_isready
- --hostname
- localhost
- --username
- ${CMD_POSTGRES_USER:-postgres}
interval: 10s
timeout: 5s
retries: 5
start_interval: 5s
start_period: 30s
environment:
POSTGRES_USER: ${CMS_POSTGRES_USER:-postgres}
POSTGRES_PASSWORD: ${CMS_POSTGRES_PASSWORD:-postgres}
volumes:
- 'postgres_data:/var/lib/postgresql/data'
- './scripts/postgres:/docker-entrypoint-initdb.d'
# NOTE: (jpd) this is an open-source alternative to redis
valkey:
image: 'valkey/valkey:8.0.2-bookworm'
hostname: ${CMS_VALKEY_HOST:-valkey}
init: true
restart: unless-stopped
healthcheck:
test:
- CMD-SHELL
- '[ $$(redis-cli ping) = "PONG" ]'
interval: 10s
timeout: 5s
retries: 5
start_interval: 5s
start_period: 30s
volumes:
- 'valkey_data:/data'
volumes:
postgres_data: {}
valkey_data: {}

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -ex
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE DATABASE strapi;
GRANT ALL PRIVILEGES ON DATABASE strapi TO ${POSTGRES_USER};
EOSQL

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
set -e
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE DATABASE directus;
GRANT ALL PRIVILEGES ON DATABASE strapi TO ${POSTGRES_USER};
EOSQL

View File

@@ -1,25 +1,36 @@
--- ---
services: services:
directus: directus:
image: 'directus/directus:11.3.2' image: 'directus/directus:11.5.1'
hostname: directus hostname: directus
init: true init: true
restart: unless-stopped restart: unless-stopped
ports: ports:
- ${CMS_DIRECTUS_PORTS:-8055:8055} - ${CMS_DIRECTUS_PORTS:-8055:8055}
depends_on:
postgres:
condition: service_healthy
valkey:
condition: service_healthy
volumes: volumes:
- 'database:/directus/database'
- 'uploads:/directus/uploads' - 'uploads:/directus/uploads'
- 'extensions:/directus/extensions' - 'extensions:/directus/extensions'
environment: environment:
SECRET: ${CMS_DIRECTUS_SECRET:-replace-with-random-value} SECRET: ${CMS_DIRECTUS_SECRET:-replace-with-random-value}
ADMIN_EMAIL: ${CMS_DIRECTUS_ADMIN_EMAIL:-admin@example.com} ADMIN_EMAIL: ${CMS_DIRECTUS_ADMIN_EMAIL:-admin@example.com}
ADMIN_PASSWORD: ${CMS_DIRECTUS_ADMIN_PASSWORD:-d1r3ctu5} ADMIN_PASSWORD: ${CMS_DIRECTUS_ADMIN_PASSWORD:-d1r3ctu5}
DB_CLIENT: sqlite3 CACHE_ENABLED: 'true'
DB_FILENAME: /directus/database/data.db CACHE_AUTO_PURGE: 'true'
CACHE_STORE: redis
REDIS: ${CMS_VALKEY_URI:-redis://valkey:6379}
DB_CLIENT: pg
DB_USER: ${CMS_POSTGRES_USER:-postgres}
DB_PASSWORD: ${CMS_POSTGRES_PASSWORD:-postgres}
DB_HOST: ${CMS_POSTGRES_HOST:-postgres}
DB_PORT: ${CMS_POSTGRES_PORT:-5432}
DB_DATABASE: directus
WEBSOCKETS_ENABLED: 'true' WEBSOCKETS_ENABLED: 'true'
volumes: volumes:
database: {}
extensions: {} extensions: {}
uploads: {} uploads: {}

View File

@@ -1,49 +1,66 @@
FROM node:18-alpine3.18 AS development ARG BASE_IMAGE=node:18.20.7-alpine3.21
# Installing libvips-dev for sharp Compatibility
RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev libpng-dev nasm bash vips-dev git FROM ${BASE_IMAGE} AS development
RUN apk update \
&& apk add --no-cache \
autoconf \
automake \
bash \
build-base \
gcc \
git \
libpng-dev \
nasm \
vips-dev \
zlib-dev
ARG NODE_ENV=development ARG NODE_ENV=development
ENV NODE_ENV=${NODE_ENV} ENV NODE_ENV=${NODE_ENV}
WORKDIR /opt/ WORKDIR /opt/
COPY package.json yarn.lock ./ COPY ./cms/package.json ./cms/yarn.lock ./
RUN yarn global add node-gyp RUN yarn global add node-gyp \
RUN yarn config set network-timeout 600000 -g && yarn install && yarn config set network-timeout 600000 -g \
&& yarn install
ENV PATH /opt/node_modules/.bin:$PATH ENV PATH /opt/node_modules/.bin:$PATH
WORKDIR /opt/app WORKDIR /opt/app
COPY . . COPY ./cms .
RUN chown -R node:node /opt/app RUN chown -R node:node /opt/app
USER node USER node
RUN ["yarn", "build"] RUN ["yarn", "build"]
EXPOSE 1337 EXPOSE 1337
CMD ["yarn", "develop"] CMD ["yarn", "develop"]
# Creating multi-stage build for production FROM ${BASE_IMAGE} AS build
FROM node:18-alpine as build RUN apk update \
RUN apk update && apk add --no-cache build-base gcc autoconf automake zlib-dev libpng-dev vips-dev git > /dev/null 2>&1 && apk add --no-cache \
ENV NODE_ENV=production autoconf \
automake \
build-base \
gcc \
git \
libpng-dev \
vips-dev \
zlib-dev > /dev/null 2>&1
ARG NODE_ENV=production
ENV NODE_ENV=${NODE_ENV} ENV NODE_ENV=${NODE_ENV}
WORKDIR /opt/ WORKDIR /opt/
COPY package.json yarn.lock ./ COPY ./cms/package.json ./cms/yarn.lock ./
RUN yarn global add node-gyp RUN yarn global add node-gyp \
RUN yarn config set network-timeout 600000 -g && yarn install --production && yarn config set network-timeout 600000 -g \
&& yarn install --production
ENV PATH /opt/node_modules/.bin:$PATH ENV PATH /opt/node_modules/.bin:$PATH
WORKDIR /opt/app WORKDIR /opt/app
COPY . . COPY . .
RUN yarn build RUN yarn build
# Creating final production image FROM ${BASE_IMAGE} AS production
FROM node:18-alpine
RUN apk add --no-cache vips-dev RUN apk add --no-cache vips-dev
ENV NODE_ENV=production ARG NODE_ENV=production
ENV NODE_ENV=${NODE_ENV} ENV NODE_ENV=${NODE_ENV}
WORKDIR /opt/ WORKDIR /opt/
COPY --from=build /opt/node_modules ./node_modules COPY --from=build /opt/node_modules ./node_modules
WORKDIR /opt/app WORKDIR /opt/app
COPY --from=build /opt/app ./ COPY --from=build /opt/app ./
ENV PATH /opt/node_modules/.bin:$PATH ENV PATH /opt/node_modules/.bin:$PATH
RUN chown -R node:node /opt/app RUN chown -R node:node /opt/app
USER node USER node
EXPOSE 1337 EXPOSE 1337

View File

@@ -1,59 +1,55 @@
--- ---
services: services:
strapi: strapi_development:
container_name: strapi build:
build: . context: .
image: strapi:latest target: development
args:
NODE_ENV: development
pull_policy: never
image: 'strapi:${CMS_STRAPI_TAG:-dev}'
restart: unless-stopped restart: unless-stopped
env_file: .env hostname: strapi_development
environment: environment: &strapi_env
DATABASE_CLIENT: ${DATABASE_CLIENT} DATABASE_CLIENT: postgres
DATABASE_HOST: strapiDB DATABASE_HOST: ${CMS_POSTGRES_HOST:-postgres}
DATABASE_PORT: ${DATABASE_PORT} DATABASE_PORT: ${CMS_POSTGRES_PORT:-5432}
DATABASE_NAME: ${DATABASE_NAME} DATABASE_NAME: strapi_development
DATABASE_USERNAME: ${DATABASE_USERNAME} DATABASE_USERNAME: ${CMS_POSTGRES_USER:-postgres}
DATABASE_PASSWORD: ${DATABASE_PASSWORD} DATABASE_PASSWORD: ${CMS_POSTGRES_PASSWORD:-postgres}
JWT_SECRET: ${JWT_SECRET} JWT_SECRET: ${CMS_STRAPI_JWT_SECRET:-replace-with-random-value}
ADMIN_JWT_SECRET: ${ADMIN_JWT_SECRET} ADMIN_JWT_SECRET: ${CMS_STRAPI_ADMIN_JWT_SECRET:-replace-with-random-value}
APP_KEYS: ${APP_KEYS} APP_KEYS: ${CMS_STRAPI_APP_KEYS:-replace-with-random-value}
NODE_ENV: ${NODE_ENV} NODE_ENV: development
volumes:
- ./config:/opt/app/config
- ./src:/opt/app/src
- ./package.json:/opt/package.json
- ./yarn.lock:/opt/yarn.lock
- ./.env:/opt/app/.env
- ./public/uploads:/opt/app/public/uploads
ports:
- "1337:1337"
networks:
- strapi
depends_on: depends_on:
- strapiDB postgres:
condition: service_healthy
strapiDB:
container_name: strapiDB
platform: linux/amd64 #for platform error on Apple M1 chips
restart: unless-stopped
env_file: .env
image: postgres:12.0-alpine
environment:
POSTGRES_USER: ${DATABASE_USERNAME}
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
POSTGRES_DB: ${DATABASE_NAME}
volumes: volumes:
- strapi-data:/var/lib/postgresql/data/ #using a volume - ./cms/package.json:/opt/package.json
#- ./data:/var/lib/postgresql/data/ # if you want to use a bind folder - ./cms/yarn.lock:/opt/yarn.lock
- ./cms/src:/opt/app/src
- ./cms/config:/opt/app/config
- ./cms/public/uploads:/opt/app/public/uploads
ports: ports:
- "5432:5432" - ${CMS_STRAPI_PORTS:-1337:1337}
networks:
- strapi
volumes: strapi_production:
strapi-data: build:
context: .
networks: target: production
strapi: args:
name: Strapi NODE_ENV: production
driver: bridge pull_policy: never
image: 'strapi:${CMS_STRAPI_PRODUCTION_TAG:-prod}'
restart: unless-stopped
hostname: strapi_production
profiles:
- production
environment:
<<: *strapi_env
NODE_ENV: production
depends_on:
postgres:
condition: service_healthy
ports:
- ${CMS_STRAPI_PRODUCTION_PORTS:-1338:1337}