From 0ab13fcfee5349aca7645fa4f8f93e8d17d3700c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sat, 16 Jan 2021 19:26:07 +0100 Subject: [PATCH 1/2] [MOD] Bump version number --- Makefile | 4 ++-- docker-compose.yml | 2 +- sysPass-php7.3/Dockerfile | 6 +++--- sysPass-php7.3/docker-compose.yml | 2 +- sysPass-php7.3_dev/Dockerfile | 6 +++--- sysPass-php7.3_dev/docker-compose.yml | 2 +- sysPass-php7.4/Dockerfile | 6 +++--- sysPass-php7.4/docker-compose.yml | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 40852f8..35818bb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION=3.2.0 -BUILD_NUMBER=20122001 +VERSION=3.2.1 +BUILD_NUMBER=21011601 build_vendor: cd build \ diff --git a/docker-compose.yml b/docker-compose.yml index 19c7053..dddaa9b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: app: container_name: syspass-app - image: syspass/syspass:3.2.0 + image: syspass/syspass:3.2.1 restart: always ports: - "80" diff --git a/sysPass-php7.3/Dockerfile b/sysPass-php7.3/Dockerfile index 28210b8..aa5af0c 100644 --- a/sysPass-php7.3/Dockerfile +++ b/sysPass-php7.3/Dockerfile @@ -4,7 +4,7 @@ # FROM composer:1.10 as bootstrap -ENV SYSPASS_BRANCH="3.2.0" +ENV SYSPASS_BRANCH="3.2.1" RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \ && composer install \ @@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy FROM debian:buster as app -LABEL maintainer=nuxsmin@syspass.org version=3.2.0 php=7.3 environment=production +LABEL maintainer=nuxsmin@syspass.org version=3.2.1 php=7.3 environment=production RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get -y install \ @@ -60,7 +60,7 @@ ENV APACHE_RUN_USER="www-data" \ WORKDIR /var/www/html -LABEL build=20122001 +LABEL build=21011601 # Custom sysPass Apache config with SSL by default COPY ["syspass.conf", "/etc/apache2/sites-available/"] diff --git a/sysPass-php7.3/docker-compose.yml b/sysPass-php7.3/docker-compose.yml index 3b2720a..72e422c 100644 --- a/sysPass-php7.3/docker-compose.yml +++ b/sysPass-php7.3/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: app: container_name: syspass-app - image: syspass/syspass:3.2.0-php7.3 + image: syspass/syspass:3.2.1-php7.3 restart: always ports: - "80" diff --git a/sysPass-php7.3_dev/Dockerfile b/sysPass-php7.3_dev/Dockerfile index 3edb11e..10ce536 100644 --- a/sysPass-php7.3_dev/Dockerfile +++ b/sysPass-php7.3_dev/Dockerfile @@ -4,7 +4,7 @@ # FROM composer:1.10 as bootstrap -ENV SYSPASS_BRANCH="3.2.0" +ENV SYSPASS_BRANCH="3.2.1" RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \ && composer install \ @@ -18,7 +18,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy FROM debian:buster as app -LABEL maintainer=nuxsmin@syspass.org version=3.2.0 php=7.3 environment=debug +LABEL maintainer=nuxsmin@syspass.org version=3.2.1 php=7.3 environment=debug RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get -y install \ @@ -64,7 +64,7 @@ ENV APACHE_RUN_USER="www-data" \ WORKDIR /var/www/html -LABEL build=20122001 +LABEL build=21011601 # Custom sysPass Apache config with SSL by default COPY ["syspass.conf", "/etc/apache2/sites-available/"] diff --git a/sysPass-php7.3_dev/docker-compose.yml b/sysPass-php7.3_dev/docker-compose.yml index 3b2720a..72e422c 100644 --- a/sysPass-php7.3_dev/docker-compose.yml +++ b/sysPass-php7.3_dev/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: app: container_name: syspass-app - image: syspass/syspass:3.2.0-php7.3 + image: syspass/syspass:3.2.1-php7.3 restart: always ports: - "80" diff --git a/sysPass-php7.4/Dockerfile b/sysPass-php7.4/Dockerfile index 60fe5ba..3cf2679 100644 --- a/sysPass-php7.4/Dockerfile +++ b/sysPass-php7.4/Dockerfile @@ -5,7 +5,7 @@ FROM composer:1.10 as bootstrap -ENV SYSPASS_BRANCH="3.2.0" +ENV SYSPASS_BRANCH="3.2.1" RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git \ && composer install \ @@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy FROM php:7.4-apache-buster as app -LABEL maintainer=nuxsmin@syspass.org version=3.2.0 php=7.4 +LABEL maintainer=nuxsmin@syspass.org version=3.2.1 php=7.4 RUN apt-get update \ && apt-get install -y \ @@ -50,7 +50,7 @@ ENV APACHE_RUN_USER="www-data" \ WORKDIR /var/www/html -LABEL build=20122001 +LABEL build=21011601 # Custom sysPass Apache config with SSL by default COPY ["syspass.conf", "/etc/apache2/sites-available/"] diff --git a/sysPass-php7.4/docker-compose.yml b/sysPass-php7.4/docker-compose.yml index 985ca76..eb72f11 100644 --- a/sysPass-php7.4/docker-compose.yml +++ b/sysPass-php7.4/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: app: container_name: syspass-app - image: syspass/syspass:3.2.0-php7.4 + image: syspass/syspass:3.2.1-php7.4 restart: always ports: - "80" From e18cf516ab1fb591aaac107b31ecea32c40cf343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sat, 16 Jan 2021 19:27:13 +0100 Subject: [PATCH 2/2] [MOD] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8640bd5..6a6f810 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ See more at https://syspass.org **No compilation stuff done** -## 3.1 release +## 3.2 release These images are based on Debian 10 (Buster), Apache 2.4 webserver with PHP 7.[3-4] module and MariaDB 10.2