Skip to content

Commit 8e05deb

Browse files
authored
fix (CI): add missing docs folder to docker images (baserow#4559)
1 parent 80502fe commit 8e05deb

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

.env.docker-dev.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# See: https://docs.docker.com/compose/how-tos/profiles/
1212
COMPOSE_PROFILES=optional
1313

14-
SECRET_KEY=baserow
14+
SECRET_KEY=baserow # CHANGE THIS IN PRODUCTION!
1515
DATABASE_PASSWORD=baserow
1616
REDIS_PASSWORD=baserow
1717

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,14 @@ DJANGO_SETTINGS_MODULE=baserow.config.settings.dev
1212
# DJANGO_SETTINGS_MODULE=baserow.config.settings.test
1313

1414
# =============================================================================
15-
# Security (use simple values for local dev only!)
15+
# Security (use same values as in env.docker-dev for local dev only!)
1616
# =============================================================================
17-
SECRET_KEY=baserow
18-
BASEROW_JWT_SIGNING_KEY=baserow
17+
SECRET_KEY=baserow # CHANGE THIS IN PRODUCTION!
1918

2019
# =============================================================================
2120
# Database (local PostgreSQL)
2221
# =============================================================================
2322
DATABASE_HOST=localhost
24-
DATABASE_PORT=5432
25-
DATABASE_NAME=baserow
26-
DATABASE_USER=baserow
27-
DATABASE_PASSWORD=baserow
2823
# speed up operations and tests (must be single line, quoted for bash sourcing)
2924
POSTGRES_DEV_EXTRA_ARGS="-c shared_buffers=512MB -c fsync=off -c full_page_writes=off -c synchronous_commit=off -c max_locks_per_transaction=512 -c logging_collector=off -c log_statement=none -c log_duration=off -c log_min_duration_statement=-1 -c log_checkpoints=off -c log_connections=off -c log_disconnections=off -c log_lock_waits=off -c log_temp_files=-1 -c checkpoint_timeout=1h -c max_wal_size=10GB -c min_wal_size=1GB -c wal_level=minimal -c max_wal_senders=0 -c autovacuum=off -c random_page_cost=1.0 -c effective_io_concurrency=200 -c work_mem=256MB -c maintenance_work_mem=512MB"
3025

@@ -35,7 +30,6 @@ POSTGRES_DEV_EXTRA_ARGS="-c shared_buffers=512MB -c fsync=off -c full_page_write
3530
# Redis (local Redis)
3631
# =============================================================================
3732
REDIS_HOST=localhost
38-
REDIS_PORT=6379
3933
REDIS_PASSWORD=baserow
4034

4135
# =============================================================================
@@ -71,4 +65,4 @@ MIGRATE_ON_STARTUP=false
7165
# Media files (path relative to the backend folder)
7266
# =============================================================================
7367
MEDIA_ROOT=media
74-
MEDIA_URL=http://localhost:8000/media/
68+
MEDIA_URL=http://localhost:4000/media/

backend/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ RUN mkdir -p /baserow/backend/reports /baserow/premium/backend /baserow/enterpri
207207

208208
# Copy the virtual environment and source code with tests
209209
COPY --chown=$UID:$GID --from=builder-ci /baserow /baserow
210+
COPY --chown=$UID:$GID ./docs /baserow/docs/
210211
COPY --chown=$UID:$GID deploy/plugins/*.sh /baserow/plugins/
211212

212213
USER $UID:$GID
@@ -355,6 +356,7 @@ COPY --chown=$UID:$GID LICENSE /baserow/LICENSE
355356
COPY --chown=$UID:$GID --from=builder-prod /baserow/backend /baserow/backend/
356357
COPY --chown=$UID:$GID --from=builder-prod /baserow/premium /baserow/premium/
357358
COPY --chown=$UID:$GID --from=builder-prod /baserow/enterprise /baserow/enterprise/
359+
COPY --chown=$UID:$GID ./docs /baserow/docs/
358360

359361
COPY --chown=$UID:$GID deploy/plugins/*.sh /baserow/plugins/
360362

backend/justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ init: _setup-env _create-venv
120120
@echo " just run <command>"
121121
@echo " uv run <command>"
122122

123-
# Copy .env.local.example to .env.local if it doesn't exist (in project root)
123+
# Copy .env.local-dev.example to .env.local if it doesn't exist (in project root)
124124
_setup-env:
125125
#!/usr/bin/env bash
126126
set -euo pipefail
127-
if [ ! -f ../.env.local ] && [ -f ../.env.local.example ]; then
128-
echo "Creating .env.local from .env.local.example..."
129-
cp ../.env.local.example ../.env.local
127+
if [ ! -f ../.env.local ] && [ -f ../.env.local-dev.example ]; then
128+
echo "Creating .env.local from .env.local-dev.example..."
129+
cp ../.env.local-dev.example ../.env.local
130130
echo "Please review and edit .env.local as needed."
131131
fi
132132

docs/development/running-the-dev-env-locally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ All processes log to `/tmp/`:
121121

122122
### The .env.local File
123123

124-
The `just init` command creates `.env.local` in the project root with sensible defaults, taken from `.env.local.example`:
124+
The `just init` command creates `.env.local` in the project root with sensible defaults, taken from `.env.local-dev.example`:
125125

126126
```bash
127127
# Key settings in .env.local

justfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ _dev-start:
218218

219219
# Create .env.local from example if it doesn't exist
220220
if [ ! -f .env.local ]; then
221-
if [ -f .env.local.example ]; then
222-
echo "Creating .env.local from .env.local.example..."
223-
cp .env.local.example .env.local
221+
if [ -f .env.local-dev.example ]; then
222+
echo "Creating .env.local from .env.local-dev.example..."
223+
cp .env.local-dev.example .env.local
224224
echo ""
225225
else
226-
echo "Warning: .env.local.example not found, skipping .env.local creation"
226+
echo "Warning: .env.local-dev.example not found, skipping .env.local creation"
227227
echo ""
228228
fi
229229
fi
@@ -240,7 +240,7 @@ _dev-start:
240240

241241
# Start docker services (redis, db, mailhog, otel-collector)
242242
echo "==> Starting Docker services (redis, db, mailhog, otel-collector)..."
243-
just dc-dev up -d redis db mailhog otel-collector
243+
just dc-dev up -d redis db mailhog otel-collector caddy
244244

245245
# Wait for services to be ready
246246
echo "==> Waiting for PostgreSQL to be ready..."

0 commit comments

Comments
 (0)