Tag master with latest
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Armin Friedl 2020-07-26 11:09:31 +02:00
parent 1b81629ea2
commit e03a0fd233
Signed by: armin
GPG key ID: 48C726EEE7FBCBC8
2 changed files with 28 additions and 3 deletions

View file

@ -74,12 +74,13 @@ steps:
- ls -al - ls -al
- cd web/fling - cd web/fling
- npm install && npm run build - 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/ - tar czf fling-web-$VERSION.tar.gz build/
- curl --user "$NEXUS_USER:$NEXUS_PASSWORD" - curl --user "$NEXUS_USER:$NEXUS_PASSWORD"
--upload-file ./fling-web-$VERSION.tar.gz --upload-file ./fling-web-$VERSION.tar.gz
https://nexus.friedl.net/repository/build-artifacts/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 image: plugins/docker
settings: settings:
username: username:
@ -92,6 +93,29 @@ steps:
tags: 0.1.0-snapshot tags: 0.1.0-snapshot
build_args: build_args:
- VERSION=0.1.0-snapshot - 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: volumes:
- name: m2-cache - name: m2-cache

View file

@ -20,7 +20,8 @@ fling:
archive.filesystem.archive-path: "/var/fling/files" archive.filesystem.archive-path: "/var/fling/files"
security: security:
allowed-origins: allowed-origins:
- "https://friedl.net" - "https://fling.friedl.net"
- "http://localhost:3000"
- "http://localhost:3000" - "http://localhost:3000"
- "http://localhost:5000" - "http://localhost:5000"
- "http://10.0.2.2:5000" - "http://10.0.2.2:5000"