From b61677ebe8c9956db4fd8c43202fe803311f5ac1 Mon Sep 17 00:00:00 2001 From: Varakh Date: Sat, 25 Mar 2023 09:28:18 +0100 Subject: [PATCH] Use master as release branch, add drone pipeline and periodic rebuilds #noissue --- .drone.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++ CHANGELOG.md | 3 --- Dockerfile | 19 +++++++++++---- README.md | 2 ++ config/Constants.php | 2 +- 5 files changed, 74 insertions(+), 9 deletions(-) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..550f8d0 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,57 @@ +--- +kind: pipeline +type: docker +name: default + +trigger: + event: + include: + - push + - cron + branch: + - master + +environment: &default_environment + REVISION: ${DRONE_COMMIT_SHA} + CREATED: ${DRONE_BUILD_CREATED} + SOURCE_URL: ${DRONE_GIT_HTTP_URL} + # also change in 'tags' of build docker + TS3WEB_VERSION: 2.2.5 + +steps: + - name: build docker image + image: plugins/docker + environment: + <<: *default_environment + settings: + purge: true + repo: varakh/ts3web + username: + from_secret: dockerhub_user + password: + from_secret: dockerhub_key + tags: + - latest + - 2.2.5 + + - name: notify + image: drillster/drone-email + settings: + subject: "Build failed" + body: "URL ${DRONE_BUILD_LINK}" + host: + from_secret: mail_host + username: + from_secret: mail_user + password: + from_secret: mail_password + from: + from_secret: mail_from + when: + status: + - failure +--- +kind: signature +hmac: f575a63bd85c4a95593be5e077373216fbd50ad57e6b3d1db56f950e881ed2a5 + +... diff --git a/CHANGELOG.md b/CHANGELOG.md index 96abf76..bc85c34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,5 @@ # CHANGELOG -## 2.2.6 - UNRELEASED -* ... - ## 2.2.5 - 2022/12/17 * Updated `Dockerfile` (as long as alpine 3.15 shipping PHP7 is kept updated, `ts3web` docker images are kept) * Updated some symfony dependencies diff --git a/Dockerfile b/Dockerfile index bba0eab..312117f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,15 @@ FROM alpine:3.15 -LABEL maintainer="Varakh" +LABEL maintainer="Varakh " \ + description="ts3web" \ + org.opencontainers.image.authors="Varakh" \ + org.opencontainers.image.revision="${REVISION}" \ + org.opencontainers.image.vendor="Varakh" \ + org.opencontainers.image.title="ts3web" \ + org.opencontainers.image.description="ts3web" \ + org.opencontainers.image.base.name="alpine:3.15" \ + org.opencontainers.artifact.created=${CREATED} \ + org.opencontainers.image.source=${SOURCE_URL} ENV APP_HOME /var/www/html/application @@ -20,10 +29,10 @@ ADD config ${APP_HOME}/config RUN mv ${APP_HOME}/config/env.example ${APP_HOME}/config/env # php.ini -ENV PHP_MEMORY_LIMIT 512M -ENV MAX_UPLOAD 1024M -ENV PHP_MAX_FILE_UPLOAD 200 -ENV PHP_MAX_POST 1024M +ENV PHP_MEMORY_LIMIT=512M \ + MAX_UPLOAD=1024M \ + PHP_MAX_FILE_UPLOAD=200 \ + PHP_MAX_POST=1024M # install dependencies RUN apk add --update --no-cache \ diff --git a/README.md b/README.md index e3fcb40..3592bb8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # README +[![Build Status](https://drone.myservermanager.com/api/badges/varakh/ts3web/status.svg)](https://drone.myservermanager.com/varakh/ts3web) + ts3web is a free and open-source web interface for TeamSpeak 3 instances. The minimalistic approach of this application is intentional. diff --git a/config/Constants.php b/config/Constants.php index 2eea102..7943499 100644 --- a/config/Constants.php +++ b/config/Constants.php @@ -13,7 +13,7 @@ class Constants /** * Version tag */ - const VERSION = '2.2.6-SNAPSHOT'; + const VERSION = '2.2.5'; /** * Return constant by its class name