From b6a9c3bb3876128b6d17d5955e9088d4a0ac87f9 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 28 Jul 2022 20:34:53 +0200 Subject: [PATCH] Replace SFTP-publish with docker-publish --- .woodpecker/.continuous-deployment.yml | 33 ++++---------------------- .woodpecker/.releaser.yml | 33 ++++---------------------- 2 files changed, 8 insertions(+), 58 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index a486228c7..b1bc2406a 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -90,37 +90,12 @@ pipeline: repo: friendica/friendica branch: [ develop, '*-rc' ] event: push - upload_artifacts: + publish_artifacts: image: alpine - secrets: - - source: sftp_host - target: lftp_host - - source: sftp_user - target: lftp_user - - source: ssh_key - target: lftp_key - environment: - LFTP_PORT: "22" - LFTP_SOURCE: "build" - LFTP_TARGET: "/http" - volumes: - - /etc/hosts:/etc/hosts commands: - - apk add lftp openssh openssl - - touch drone.key - - chmod 400 drone.key - - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key - - lftp -c " - set net:timeout 5; - set net:max-retries 2; - set net:reconnect-interval-base 5; - set sftp:auto-confirm true; - set sftp:connect-program 'ssh -q -a -x -i drone.key'; - connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT; - cd $LFTP_TARGET; - mput $LFTP_SOURCE/*; - " - - rm drone.key + - cp -fr build/* /tmp/friendica_files/ + volumes: + - files:/tmp/friendica_files when: repo: friendica/friendica branch: [ develop, '*-rc' ] diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index d254b8199..043071ddd 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -88,37 +88,12 @@ pipeline: repo: friendica/friendica branch: stable event: tag - upload_artifacts: + publish_artifacts: image: alpine - secrets: - - source: sftp_host - target: lftp_host - - source: sftp_user - target: lftp_user - - source: ssh_key - target: lftp_key - environment: - LFTP_PORT: "22" - LFTP_SOURCE: "build" - LFTP_TARGET: "/http" - volumes: - - /etc/hosts:/etc/hosts commands: - - apk add lftp openssh openssl - - touch drone.key - - chmod 400 drone.key - - echo "$LFTP_KEY" | openssl base64 -A -d > drone.key - - lftp -c " - set net:timeout 5; - set net:max-retries 2; - set net:reconnect-interval-base 5; - set sftp:auto-confirm true; - set sftp:connect-program 'ssh -q -a -x -i drone.key'; - connect sftp://$LFTP_USER:@$LFTP_HOST:$LFTP_PORT; - cd $LFTP_TARGET; - mput $LFTP_SOURCE/*; - " - - rm drone.key + - cp -fr build/* /tmp/friendica_files/ + volumes: + - files:/tmp/friendica_files when: repo: friendica/friendica branch: stable