Skip to content

Commit

Permalink
Merge pull request #61 from nuxsmin/3.2
Browse files Browse the repository at this point in the history
chore: bump version & build.
  • Loading branch information
nuxsmin authored May 25, 2022
2 parents 7ab583e + 1855ed0 commit 37be072
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build_env() {
s/build=[0-9]\+/build='${BUILD_NUMBER}'/' ${BUILD}/Dockerfile
done

find ../ -name docker-compose.yml | while read FILE; do
find ../ -name 'docker-compose.yml' | while read FILE; do
sed -i 's/syspass:[0-9\.]\+\(-rc[0-9]\+\)\?/syspass:'${VERSION}'/' ${FILE}
done
}
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.2
image: syspass/syspass:3.2.3
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:2.0 as bootstrap

ENV SYSPASS_BRANCH="3.2.2"
ENV SYSPASS_BRANCH="3.2.3"

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.2 php=7.3 environment=production
LABEL [email protected] version=3.2.3 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=21031301
LABEL build=22052501

# 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.2-php7.3
image: syspass/syspass:3.2.3-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:2.0 as bootstrap

ENV SYSPASS_BRANCH="3.2.2"
ENV SYSPASS_BRANCH="3.2.3"

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.2 php=7.3 environment=debug
LABEL [email protected] version=3.2.3 php=7.3 environment=debug

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
Expand Down Expand Up @@ -65,7 +65,7 @@ ENV APACHE_RUN_USER="www-data" \

WORKDIR /var/www/html

LABEL build=21031301
LABEL build=22052501

# 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.2-php7.3
image: syspass/syspass:3.2.3-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:2.0 as bootstrap

ENV SYSPASS_BRANCH="3.2.2"
ENV SYSPASS_BRANCH="3.2.3"

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.2 php=7.4
LABEL [email protected] version=3.2.3 php=7.4

RUN apt-get update \
&& apt-get install -y \
Expand Down Expand Up @@ -51,7 +51,7 @@ ENV APACHE_RUN_USER="www-data" \

WORKDIR /var/www/html

LABEL build=21031301
LABEL build=22052501

# 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.2-php7.4
image: syspass/syspass:3.2.3-php7.4
restart: always
ports:
- "80"
Expand Down

0 comments on commit 37be072

Please sign in to comment.