Skip to content

Commit

Permalink
Merge pull request #50 from nuxsmin/3.2
Browse files Browse the repository at this point in the history
v3.2.1
  • Loading branch information
nuxsmin authored Jan 16, 2021
2 parents d78b692 + e18cf51 commit d91f603
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
VERSION=3.2.0
BUILD_NUMBER=20122001
VERSION=3.2.1
BUILD_NUMBER=21011601

build_vendor:
cd build \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions sysPass-php7.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -19,7 +19,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy

FROM debian:buster as app

LABEL [email protected] version=3.2.0 php=7.3 environment=production
LABEL [email protected] version=3.2.1 php=7.3 environment=production

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
Expand Down Expand Up @@ -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/"]
Expand Down
2 changes: 1 addition & 1 deletion sysPass-php7.3/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions sysPass-php7.3_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -18,7 +18,7 @@ RUN git clone --depth 1 --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sy

FROM debian:buster as app

LABEL [email protected] version=3.2.0 php=7.3 environment=debug
LABEL [email protected] version=3.2.1 php=7.3 environment=debug

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
Expand Down Expand Up @@ -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/"]
Expand Down
2 changes: 1 addition & 1 deletion sysPass-php7.3_dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions sysPass-php7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 [email protected] version=3.2.0 php=7.4
LABEL [email protected] version=3.2.1 php=7.4

RUN apt-get update \
&& apt-get install -y \
Expand Down Expand Up @@ -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/"]
Expand Down
2 changes: 1 addition & 1 deletion sysPass-php7.4/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit d91f603

Please sign in to comment.