cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(ci): update references from db/schema.sql to sqlx migrations

Browse Source 
CI and Docker builds broke after removing db/ in favor of migrations/.
- ci.yml: point psql init at migrations/20260307000000_initial_schema.sql
- Dockerfile: COPY migrations instead of db; remove unused db copy in final stage
- docker-build.yml: remove db/schema.sql presence check

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jared Wolff
2026-03-09 15:43:15 -04:00
parent 036390a242
commit f6e2b30688
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+1 -1
View File
@@ -56,7 +56,7 @@ jobs:
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- name: Initialize test database - name: Initialize test database
run: psql -h localhost -U postgres -d oxicloud_test -f db/schema.sql run: psql -h localhost -U postgres -d oxicloud_test -f migrations/20260307000000_initial_schema.sql
env: env:
PGPASSWORD: postgres PGPASSWORD: postgres
.github/workflows/docker-build.yml
-3
View File
@@ -70,7 +70,4 @@ jobs:
echo "=== Static files present ===" echo "=== Static files present ==="
docker run --rm --entrypoint sh test/oxicloud:test -c "ls /app/static/index.html && echo 'OK: static files present'" docker run --rm --entrypoint sh test/oxicloud:test -c "ls /app/static/index.html && echo 'OK: static files present'"
echo "=== DB schema present ==="
docker run --rm --entrypoint sh test/oxicloud:test -c "ls /app/db/schema.sql && echo 'OK: schema present'"
echo "✅ Docker build and test completed successfully" echo "✅ Docker build and test completed successfully"
Dockerfile
+1 -3
View File
@@ -24,7 +24,7 @@ COPY --from=cacher /usr/local/cargo/registry /usr/local/cargo/registry
COPY Cargo.toml Cargo.lock build.rs ./ COPY Cargo.toml Cargo.lock build.rs ./
COPY src src COPY src src
COPY static static COPY static static
COPY db db COPY migrations migrations
# Build with all optimizations (DATABASE_URL only needed at compile-time for sqlx) # Build with all optimizations (DATABASE_URL only needed at compile-time for sqlx)
ARG DATABASE_URL="postgres://postgres:postgres@localhost/oxicloud" ARG DATABASE_URL="postgres://postgres:postgres@localhost/oxicloud"
RUN DATABASE_URL="${DATABASE_URL}" RUSTFLAGS="-C target-cpu=native" cargo build --release RUN DATABASE_URL="${DATABASE_URL}" RUSTFLAGS="-C target-cpu=native" cargo build --release
@@ -59,8 +59,6 @@ RUN chmod +x /usr/local/bin/entrypoint.sh
# Copy processed static files (bundled/minified by build.rs in release) # Copy processed static files (bundled/minified by build.rs in release)
COPY --from=builder --chown=oxicloud:oxicloud /app/static-dist /app/static COPY --from=builder --chown=oxicloud:oxicloud /app/static-dist /app/static
COPY --chown=oxicloud:oxicloud db /app/db
# Create storage directory with proper permissions # Create storage directory with proper permissions
RUN mkdir -p /app/storage && chown -R oxicloud:oxicloud /app/storage RUN mkdir -p /app/storage && chown -R oxicloud:oxicloud /app/storage