CI: Update Drone config and Makefile for new release branch
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
parent
6958820475
commit
9d887ca5d2
21
.drone.yml
21
.drone.yml
|
@ -51,7 +51,7 @@ steps:
|
||||||
- failure
|
- failure
|
||||||
- success
|
- success
|
||||||
|
|
||||||
- name: deploy
|
- name: deploy-preview
|
||||||
environment:
|
environment:
|
||||||
DOCKER_USERNAME:
|
DOCKER_USERNAME:
|
||||||
from_secret: docker_username
|
from_secret: docker_username
|
||||||
|
@ -59,13 +59,28 @@ steps:
|
||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
commands:
|
commands:
|
||||||
- scripts/docker-login.sh
|
- scripts/docker-login.sh
|
||||||
- make docker-photoprism docker-photoprism-pull docker-demo
|
- make docker-photoprism-preview docker-demo
|
||||||
when:
|
when:
|
||||||
status:
|
status:
|
||||||
- success
|
- success
|
||||||
branch:
|
branch:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
- name: deploy-release
|
||||||
|
environment:
|
||||||
|
DOCKER_USERNAME:
|
||||||
|
from_secret: docker_username
|
||||||
|
DOCKER_PASSWORD:
|
||||||
|
from_secret: docker_password
|
||||||
|
commands:
|
||||||
|
- scripts/docker-login.sh
|
||||||
|
- make docker-photoprism
|
||||||
|
when:
|
||||||
|
status:
|
||||||
|
- success
|
||||||
|
branch:
|
||||||
|
- release
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: exec
|
type: exec
|
||||||
|
@ -104,7 +119,7 @@ name: linux-arm64
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- master
|
- release
|
||||||
|
|
||||||
platform:
|
platform:
|
||||||
arch: arm64
|
arch: arm64
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -167,6 +167,9 @@ docker-development:
|
||||||
docker-photoprism:
|
docker-photoprism:
|
||||||
scripts/docker-build.sh photoprism $(DOCKER_TAG)
|
scripts/docker-build.sh photoprism $(DOCKER_TAG)
|
||||||
scripts/docker-push.sh photoprism $(DOCKER_TAG)
|
scripts/docker-push.sh photoprism $(DOCKER_TAG)
|
||||||
|
docker-photoprism-preview:
|
||||||
|
scripts/docker-build.sh photoprism
|
||||||
|
scripts/docker-push.sh photoprism
|
||||||
docker-photoprism-local:
|
docker-photoprism-local:
|
||||||
scripts/docker-build.sh photoprism
|
scripts/docker-build.sh photoprism
|
||||||
docker-photoprism-pull:
|
docker-photoprism-pull:
|
||||||
|
@ -180,8 +183,8 @@ docker-demo:
|
||||||
scripts/docker-push.sh demo $(DOCKER_TAG)
|
scripts/docker-push.sh demo $(DOCKER_TAG)
|
||||||
docker-demo-local:
|
docker-demo-local:
|
||||||
scripts/docker-build.sh photoprism
|
scripts/docker-build.sh photoprism
|
||||||
scripts/docker-build.sh demo
|
scripts/docker-build.sh demo $(DOCKER_TAG)
|
||||||
scripts/docker-push.sh demo
|
scripts/docker-push.sh demo $(DOCKER_TAG)
|
||||||
docker-webdav:
|
docker-webdav:
|
||||||
docker pull golang:1
|
docker pull golang:1
|
||||||
scripts/docker-build.sh webdav $(DOCKER_TAG)
|
scripts/docker-build.sh webdav $(DOCKER_TAG)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM photoprism/photoprism:latest as build
|
FROM photoprism/photoprism:preview as build
|
||||||
|
|
||||||
# Hide TensorFlow warnings
|
# Hide TensorFlow warnings
|
||||||
ENV TF_CPP_MIN_LOG_LEVEL 2
|
ENV TF_CPP_MIN_LOG_LEVEL 2
|
||||||
|
|
|
@ -4,8 +4,9 @@ if [[ -z $1 ]] && [[ -z $2 ]]; then
|
||||||
echo "Please provide a container image name and version" 1>&2
|
echo "Please provide a container image name and version" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
elif [[ $1 ]] && [[ -z $2 ]]; then
|
elif [[ $1 ]] && [[ -z $2 ]]; then
|
||||||
echo "Building 'photoprism/$1:latest'...";
|
DOCKER_TAG=$(date -u +%Y%m%d)
|
||||||
docker build --no-cache --build-arg BUILD_TAG=$2 -t photoprism/$1:latest -f docker/${1/-//}/Dockerfile .
|
echo "Building 'photoprism/$1:preview'...";
|
||||||
|
docker build --no-cache --build-arg BUILD_TAG="${DOCKER_TAG}" -t photoprism/$1:preview -f docker/${1/-//}/Dockerfile .
|
||||||
echo "Done"
|
echo "Done"
|
||||||
else
|
else
|
||||||
echo "Building 'photoprism/$1:$2'...";
|
echo "Building 'photoprism/$1:$2'...";
|
||||||
|
|
|
@ -8,8 +8,8 @@ if [[ -z $1 ]] && [[ -z $2 ]]; then
|
||||||
echo "Please provide a container image name and version" 1>&2
|
echo "Please provide a container image name and version" 1>&2
|
||||||
exit 1
|
exit 1
|
||||||
elif [[ $1 ]] && [[ -z $2 ]]; then
|
elif [[ $1 ]] && [[ -z $2 ]]; then
|
||||||
echo "Pushing 'photoprism/$1:latest' to Docker hub...";
|
echo "Pushing 'photoprism/$1:preview' to Docker hub...";
|
||||||
docker push photoprism/$1:latest
|
docker push photoprism/$1:preview
|
||||||
echo "Done"
|
echo "Done"
|
||||||
else
|
else
|
||||||
echo "Pushing 'photoprism/$1:$2' to Docker hub...";
|
echo "Pushing 'photoprism/$1:$2' to Docker hub...";
|
||||||
|
|
Loading…
Reference in a new issue