From e03a0fd2339f982188e53d2cc4989fbbc8222096 Mon Sep 17 00:00:00 2001
From: Armin Friedl <dev@friedl.net>
Date: Sun, 26 Jul 2020 11:09:31 +0200
Subject: [PATCH] Tag master with latest

---
 .drone.yml                                    | 26 ++++++++++++++++++-
 .../src/main/resources/application-prod.yml   |  5 ++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 5f4ff04..525faa7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -74,12 +74,13 @@ steps:
     - ls -al
     - cd web/fling
     - npm install && npm run build
+    - npm install --no-cache @fling/flingclient # make sure flingclient is not cached
     - tar czf fling-web-$VERSION.tar.gz build/
     - curl --user "$NEXUS_USER:$NEXUS_PASSWORD"
            --upload-file ./fling-web-$VERSION.tar.gz
            https://nexus.friedl.net/repository/build-artifacts/fling-web-$VERSION.tar.gz
 
-- name: publish
+- name: publish branch
   image: plugins/docker
   settings:
     username:
@@ -92,6 +93,29 @@ steps:
     tags: 0.1.0-snapshot
     build_args:
       - VERSION=0.1.0-snapshot
+  when:
+    branch:
+      exclude:
+        - master
+
+- name: publish master
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+    dockerfile: container/Dockerfile
+    context: ./container
+    repo: arminfriedl/fling
+    tags:
+      - 0.1.0-snapshot
+      - latest
+    build_args:
+      - VERSION=0.1.0-snapshot
+  when:
+    branch:
+      - master
 
 volumes:
 - name: m2-cache
diff --git a/service/fling/src/main/resources/application-prod.yml b/service/fling/src/main/resources/application-prod.yml
index 389537b..d0579fd 100644
--- a/service/fling/src/main/resources/application-prod.yml
+++ b/service/fling/src/main/resources/application-prod.yml
@@ -20,7 +20,8 @@ fling:
   archive.filesystem.archive-path: "/var/fling/files"
   security:
     allowed-origins:
-      - "https://friedl.net"
+      - "https://fling.friedl.net"
+      - "http://localhost:3000"
       - "http://localhost:3000"
       - "http://localhost:5000"
       - "http://10.0.2.2:5000"
@@ -31,4 +32,4 @@ fling:
   api:
     version: "0.1.0-snapshot"
     server-url: "http://localhost:8080"
-    server-description: "API server for dev"
\ No newline at end of file
+    server-description: "API server for dev"