Skip to content
Merged
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 .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand Down Expand Up @@ -77,4 +80,5 @@ jobs:
context: .
push: true
target: ${{ matrix.target }}
platforms: linux/amd64,linux/arm64
tags: ${{ steps.tags.outputs.tags }}
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ pnpm compose:down
If you want to run the published Docker Hub images instead of building from source, use:

```bash
INVOLUTE_IMAGE_NAMESPACE=turnkeyai INVOLUTE_IMAGE_TAG=latest pnpm compose:pull
INVOLUTE_IMAGE_NAMESPACE=turnkeyai INVOLUTE_IMAGE_TAG=latest pnpm compose:pull:up
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest pnpm compose:pull
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest pnpm compose:pull:up
Comment on lines +145 to +146
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The environment variables INVOLUTE_IMAGE_NAMESPACE=fakechris and INVOLUTE_IMAGE_TAG=latest are now redundant in these examples because they match the default values defined in the updated docker-compose.images.yml and docker-compose.prod.images.yml files. Removing them simplifies the commands for users.

Suggested change
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest pnpm compose:pull
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest pnpm compose:pull:up
pnpm compose:pull
pnpm compose:pull:up

```

## VPS deployment (fresh install)
Expand Down Expand Up @@ -442,22 +442,22 @@ This repo ships one multi-target `Dockerfile` with `server`, `web-dev`, `web`, a
Published images:

```bash
docker pull turnkeyai/involute-server:latest
docker pull turnkeyai/involute-web:latest
docker pull turnkeyai/involute-cli:latest
docker pull fakechris/involute-server:latest
docker pull fakechris/involute-web:latest
docker pull fakechris/involute-cli:latest
```

Run the compose stack from published images:

```bash
INVOLUTE_IMAGE_NAMESPACE=turnkeyai INVOLUTE_IMAGE_TAG=latest \
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest \
docker compose -f docker-compose.images.yml up -d db server web
Comment on lines +453 to 454
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

These environment variables are redundant as they match the new defaults in the compose configuration. The command can be simplified by removing them.

Suggested change
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest \
docker compose -f docker-compose.images.yml up -d db server web
docker compose -f docker-compose.images.yml up -d db server web

```

Production compose can use the same published images:

```bash
INVOLUTE_IMAGE_NAMESPACE=turnkeyai INVOLUTE_IMAGE_TAG=latest \
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest \
docker compose --env-file .env.production \
-f docker-compose.prod.images.yml up -d
Comment on lines +460 to 462
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

These environment variables are redundant as they match the new defaults in the compose configuration. Removing them makes the production example cleaner and easier to follow.

Suggested change
INVOLUTE_IMAGE_NAMESPACE=fakechris INVOLUTE_IMAGE_TAG=latest \
docker compose --env-file .env.production \
-f docker-compose.prod.images.yml up -d
docker compose --env-file .env.production \
-f docker-compose.prod.images.yml up -d

```
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- postgres-data:/var/lib/postgresql/data

server-init:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
depends_on:
db:
condition: service_healthy
Expand All @@ -41,7 +41,7 @@ services:
restart: "no"

server:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
depends_on:
db:
condition: service_healthy
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
- "${SERVER_BIND_ADDRESS:-0.0.0.0}:4200:4200"

web:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-web:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-web:${INVOLUTE_IMAGE_TAG:-latest}
depends_on:
server:
condition: service_healthy
Expand All @@ -92,7 +92,7 @@ services:
- "${WEB_BIND_ADDRESS:-0.0.0.0}:4201:4201"

cli:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-cli:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-cli:${INVOLUTE_IMAGE_TAG:-latest}
depends_on:
db:
condition: service_healthy
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.prod.images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- postgres-prod-data:/var/lib/postgresql/data

server-init:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
restart: "no"
depends_on:
db:
Expand All @@ -41,7 +41,7 @@ services:
SEED_DEFAULT_ADMIN: "false"

server:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-server:${INVOLUTE_IMAGE_TAG:-latest}
restart: unless-stopped
depends_on:
db:
Expand Down Expand Up @@ -75,7 +75,7 @@ services:
start_period: 10s

web:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-web:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-web:${INVOLUTE_IMAGE_TAG:-latest}
environment:
INTERNAL_SERVER_ORIGIN: http://server:4200
WEB_PROXY_AUTHORIZATION: ""
Expand Down Expand Up @@ -103,7 +103,7 @@ services:
- caddy-config:/config

cli:
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-turnkeyai}/involute-cli:${INVOLUTE_IMAGE_TAG:-latest}
image: ${INVOLUTE_IMAGE_REGISTRY:-docker.io}/${INVOLUTE_IMAGE_NAMESPACE:-fakechris}/involute-cli:${INVOLUTE_IMAGE_TAG:-latest}
profiles: ["tools"]
depends_on:
db:
Expand Down
Loading