Configure monorepo build: unified CI, local deps, .dockerignore
- Dockerfiles use monorepo root as build context - common/ and core/ installed as local packages (no git+https) - Client tarball built from local client/ dir - Unified CI with change detection: common/core -> rebuild both - Per-repo CI workflows removed Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,62 +0,0 @@
|
||||
name: Build and Deploy
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
env:
|
||||
REGISTRY: registry.rose-ash.com:5000
|
||||
IMAGE: l2-server
|
||||
|
||||
jobs:
|
||||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Install tools
|
||||
run: |
|
||||
apt-get update && apt-get install -y --no-install-recommends openssh-client
|
||||
|
||||
- name: Set up SSH
|
||||
env:
|
||||
SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||
run: |
|
||||
mkdir -p ~/.ssh
|
||||
echo "$SSH_KEY" > ~/.ssh/id_rsa
|
||||
chmod 600 ~/.ssh/id_rsa
|
||||
ssh-keyscan -H "$DEPLOY_HOST" >> ~/.ssh/known_hosts 2>/dev/null || true
|
||||
|
||||
- name: Pull latest code on server
|
||||
env:
|
||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||
run: |
|
||||
ssh "root@$DEPLOY_HOST" "
|
||||
cd /root/art-dag/activity-pub
|
||||
git fetch origin main
|
||||
git reset --hard origin/main
|
||||
"
|
||||
|
||||
- name: Build and push image
|
||||
env:
|
||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||
run: |
|
||||
ssh "root@$DEPLOY_HOST" "
|
||||
cd /root/art-dag/activity-pub
|
||||
docker build --build-arg CACHEBUST=\$(date +%s) -t ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest -t ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }} .
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
|
||||
docker push ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
|
||||
"
|
||||
|
||||
- name: Deploy stack
|
||||
env:
|
||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||
run: |
|
||||
ssh "root@$DEPLOY_HOST" "
|
||||
cd /root/art-dag/activity-pub
|
||||
docker stack deploy -c docker-compose.yml activitypub
|
||||
echo 'Waiting for services to update...'
|
||||
sleep 10
|
||||
docker stack services activitypub
|
||||
"
|
||||
@@ -1,23 +1,23 @@
|
||||
FROM python:3.11-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install git for pip to clone dependencies
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install dependencies
|
||||
COPY requirements.txt .
|
||||
# Install common as local package (no more git+https)
|
||||
COPY common/ /tmp/common/
|
||||
RUN pip install --no-cache-dir /tmp/common/ && rm -rf /tmp/common
|
||||
|
||||
# Install L2 dependencies
|
||||
COPY l2/requirements.txt .
|
||||
ARG CACHEBUST=1
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
# Copy application
|
||||
COPY . .
|
||||
# Copy L2 application
|
||||
COPY l2/ .
|
||||
|
||||
# Create data directory
|
||||
RUN mkdir -p /data/l2
|
||||
|
||||
ENV PYTHONUNBUFFERED=1
|
||||
ENV ARTDAG_DATA=/data/l2
|
||||
|
||||
# Default command runs the server
|
||||
CMD ["python", "server.py"]
|
||||
|
||||
@@ -9,5 +9,4 @@ markdown>=3.5.0
|
||||
python-multipart>=0.0.6
|
||||
asyncpg>=0.29.0
|
||||
boto3>=1.34.0
|
||||
# Shared components
|
||||
git+https://git.rose-ash.com/art-dag/common.git@889ea98
|
||||
# common (artdag_common) installed from local dir in Dockerfile
|
||||
|
||||
Reference in New Issue
Block a user