diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 0c2e18c..0000000 --- a/.drone.yml +++ /dev/null @@ -1,46 +0,0 @@ -kind: pipeline -type: docker -name: default - -steps: - - name: build - image: docker:27-cli - volumes: - - name: dockersock - path: /var/run/docker.sock - environment: - REGISTRY_USER: - from_secret: REGISTRY_USER - REGISTRY_PASS: - from_secret: REGISTRY_PASS - commands: - - echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin - - docker build -t registry.infra.mintel.me/mintel/mb-grid-solutions:latest . - - docker push registry.infra.mintel.me/mintel/mb-grid-solutions:latest - when: - branch: - - main - event: - - push - - - name: deploy - image: alpine - environment: - ALPHA_SSH_KEY: - from_secret: ALPHA_SSH_KEY - commands: - - apk add --no-cache openssh - - mkdir -p ~/.ssh - - echo "$ALPHA_SSH_KEY" > ~/.ssh/id_ed25519 - - chmod 600 ~/.ssh/id_ed25519 - - ssh -o StrictHostKeyChecking=no deploy@alpha.mintel.me "cd /opt/alpha/sites/mb-grid-solutions && docker compose pull && docker compose up -d" - when: - branch: - - main - event: - - push - -volumes: - - name: dockersock - host: - path: /var/run/docker.sock \ No newline at end of file diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a7bcd2f..19cea73 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -51,17 +51,19 @@ jobs: chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H $TARGET_HOST >> ~/.ssh/known_hosts - - name: Sync project to server + - name: Ensure target directory exists + run: | + ssh $TARGET_USER@$TARGET_HOST "mkdir -p $TARGET_BASE/$PROJECT_NAME" + + - name: Sync compose file run: | rsync -avz \ - --delete \ - docker-compose.yml \ - $TARGET_USER@$TARGET_HOST:$TARGET_BASE/$PROJECT_NAME/ + infra/docker-compose.yml \ + $TARGET_USER@$TARGET_HOST:$TARGET_BASE/$PROJECT_NAME/docker-compose.yml - name: Deploy run: | ssh $TARGET_USER@$TARGET_HOST " - mkdir -p $TARGET_BASE/$PROJECT_NAME && cd $TARGET_BASE/$PROJECT_NAME && docker compose pull && docker compose up -d diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index bbd2010..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,32 +0,0 @@ -steps: - build: - image: docker:27-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - environment: - REGISTRY_USER: - from_secret: REGISTRY_USER - REGISTRY_PASS: - from_secret: REGISTRY_PASS - commands: - - echo "$REGISTRY_PASS" | docker login registry.infra.mintel.me -u "$REGISTRY_USER" --password-stdin - - docker build -t registry.infra.mintel.me/mintel/mb-grid-solutions:latest . - - docker push registry.infra.mintel.me/mintel/mb-grid-solutions:latest - when: - branch: main - event: push - - deploy: - image: alpine - environment: - ALPHA_SSH_KEY: - from_secret: ALPHA_SSH_KEY - commands: - - apk add --no-cache openssh - - mkdir -p ~/.ssh - - echo "$ALPHA_SSH_KEY" > ~/.ssh/id_ed25519 - - chmod 600 ~/.ssh/id_ed25519 - - ssh -o StrictHostKeyChecking=no deploy@alpha.mintel.me "cd /opt/alpha/sites/mb-grid-solutions && docker compose pull && docker compose up -d" - when: - branch: main - event: push \ No newline at end of file