diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4836b97..341a2d2 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -4,6 +4,15 @@ labels: steps: - name: build image: docker + when: + - branch: master + event: push + commands: + - docker build -t "$REGISTRY_IMAGE_TAG" . + - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME" + - docker push "$REGISTRY_IMAGE_TAG" + volumes: + - /var/run/docker.sock:/var/run/docker.sock environment: FORGEJO_REGISTRY_URL: from_secret: FORGEJO_REGISTRY_URL @@ -13,25 +22,3 @@ steps: from_secret: FORGEJO_REGISTRY_PASSWORD REGISTRY_IMAGE_TAG: from_secret: REGISTRY_IMAGE_TAG - commands: - - docker build -t "$REGISTRY_IMAGE_TAG" . - - echo "$FORGEJO_REGISTRY_PASSWORD" | docker login "$FORGEJO_REGISTRY_URL" --password-stdin -u "$FORGEJO_REGISTRY_USERNAME" - - docker push "$REGISTRY_IMAGE_TAG" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - name: discord - image: appleboy/drone-discord - settings: - webhook_id: - from_secret: DISCORD_WEBHOOK_ID - webhook_token: - from_secret: DISCORD_WEBHOOK_TOKEN - message: > - {{#success build.status}} - {{repo.name}} build #{{build.number}} {{build.status}} - {{/success}} - depends_on: build - -when: - - branch: master - event: push diff --git a/.woodpecker/.deploy.yml b/.woodpecker/.deploy.yml index 3ed6af7..49d02f7 100644 --- a/.woodpecker/.deploy.yml +++ b/.woodpecker/.deploy.yml @@ -1,17 +1,9 @@ steps: - name: deploy image: alpine:3.20 - environment: - SSH_HOST: - from_secret: SSH_HOST - PROJECT_DIRECTORY: - from_secret: PROJECT_DIRECTORY - WOODPECKER_SSH_KEY: - from_secret: WOODPECKER_SSH_KEY - REGISTRY_IMAGE_TAG: - from_secret: REGISTRY_IMAGE_TAG - DOCKER_VOLUME_DB: - from_secret: DOCKER_VOLUME_DB + when: + - branch: master + event: push commands: - apk add openssh - mkdir -p /root/.ssh/ @@ -22,26 +14,21 @@ steps: cd "$PROJECT_DIRECTORY"; docker-compose down; docker image rm "$REGISTRY_IMAGE_TAG" || true; - docker volume rm "$DOCKER_VOLUME_DB" || true; + docker volume rm "$DOCKER_DB_VOLUME" || true; docker pull "$REGISTRY_IMAGE_TAG"; docker-compose up -d; docker image prune -af;" - - name: discord - image: appleboy/drone-discord - settings: - webhook_id: - from_secret: DISCORD_WEBHOOK_ID - webhook_token: - from_secret: DISCORD_WEBHOOK_TOKEN - message: > - {{#success build.status}} - {{repo.name}} deployment #{{build.number}} {{build.status}} - {{/success}} - depends_on: deploy - -when: - - branch: master - event: push + environment: + SSH_HOST: + from_secret: SSH_HOST + PROJECT_DIRECTORY: + from_secret: PROJECT_DIRECTORY + WOODPECKER_SSH_KEY: + from_secret: WOODPECKER_SSH_KEY + REGISTRY_IMAGE_TAG: + from_secret: REGISTRY_IMAGE_TAG + DOCKER_DB_VOLUME: + from_secret: DOCKER_DB_VOLUME depends_on: - build