From c3a7de208d09187bd72d832f990f28581b2a0a3e Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 21 Jan 2023 15:51:49 +0100 Subject: [PATCH] updating drone --- drone/.drone.yml | 6 +++--- drone/deliver.sh | 1 - drone/image/Dockerfile | 5 +++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drone/.drone.yml b/drone/.drone.yml index 44b0df0..44bd0dd 100644 --- a/drone/.drone.yml +++ b/drone/.drone.yml @@ -5,7 +5,7 @@ mode: parallel steps: - name: Android - image: override6/tbasket-frontend + image: override6/tbasket-frontend:latest environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -16,7 +16,7 @@ steps: - bash drone/android-sign.sh - name: Electron - image: override6/tbasket-frontend + image: override6/tbasket-frontend:latest environment: SSH_PRIVATE_KEY: from_secret: SSH_PRIVATE @@ -24,7 +24,7 @@ steps: from_secret: SSH_PUBLIC commands: - - bash drone/deliver.sh electron + - bash drone/deliver.sh electron:latest - name: Web image: override6/tbasket-frontend environment: diff --git a/drone/deliver.sh b/drone/deliver.sh index c3fc035..7c2af50 100755 --- a/drone/deliver.sh +++ b/drone/deliver.sh @@ -34,7 +34,6 @@ case "$TYPE" in "browser") OUT_DIR="platforms/browser/www/*" SERV_DIR="/server/apache/TBasket/" - tree -d || ls ;; "electron") OUT_DIR="platforms/electron/build" diff --git a/drone/image/Dockerfile b/drone/image/Dockerfile index f335d94..c6cf50c 100644 --- a/drone/image/Dockerfile +++ b/drone/image/Dockerfile @@ -1,3 +1,4 @@ FROM alvrme/alpine-android:android-32-jdk11 -RUN (apk update && apk add npm openssh-client tree) &&\ - npm install -g cordova +RUN apk update \ + && apk add npm openssh-client tree rsync \ + && npm install -g cordova