Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	drone/.drone.yml

drone/.drone.yml

@@ -1,12 +1,11 @@
 kind: pipeline
 type: docker
 name: Deliver
-
+mode: parallel
-
 
 steps:
   - name: Android
-    image: override6/tbasket-frontend
+    image: alvrme/alpine-android:android-32-jdk11
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE
@@ -16,7 +15,7 @@ steps:
       - bash drone/deliver.sh android
       - bash drone/android-sign.sh
   - name: Electron
-    image: override6/tbasket-frontend
+    image: ubuntu:latest
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE
@@ -25,12 +24,11 @@ steps:
     commands:
       - drone/deliver.sh electron
   - name: Web
-    image: override6/tbasket-frontend
+    image: ubuntu:latest
     environment:
       SSH_PRIVATE_KEY:
         from_secret: SSH_PRIVATE
       SSH_PUBLIC_KEY:
         from_secret: SSH_PUBLIC
     commands:
-      - drone/deliver.sh browser
+      - drone/deliver.sh electron
-