Skip to content

Commit

Permalink
[MOD] Update to RC4
Browse files Browse the repository at this point in the history
  • Loading branch information
nuxsmin committed May 25, 2019
1 parent 37fc3d7 commit 340cb75
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

BUILDS=`find ../ -type d -name sysPass-*`
BRANCH="master"
VERSION="3.1.0-rc3"
BUILD_NUMBER="19052502"
VERSION="3.1.0-rc4"
BUILD_NUMBER="19052503"

build_env() {
for BUILD in ${BUILDS}; do
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.1.0-rc3
image: syspass/syspass:3.1.0-rc4
restart: always
ports:
- "80"
Expand Down
4 changes: 2 additions & 2 deletions sysPass-php7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN git clone --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git

FROM debian:stretch as app

LABEL [email protected] version=3.1.0-rc3 php=7.0 environment=production
LABEL [email protected] version=3.1.0-rc4 php=7.0 environment=production

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

WORKDIR /var/www/html

LABEL build=19052502
LABEL build=19052503

# 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.0/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.1.0-rc3
image: syspass/syspass:3.1.0-rc4
restart: always
ports:
- "80"
Expand Down
4 changes: 2 additions & 2 deletions sysPass-php7.0_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN git clone --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git

FROM debian:stretch as app

LABEL [email protected] version=3.1.0-rc3 php=7.0 environment=debug
LABEL [email protected] version=3.1.0-rc4 php=7.0 environment=debug

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

WORKDIR /var/www/html

LABEL build=19052502
LABEL build=19052503

# 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.0_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.1.0-rc3-dev
image: syspass/syspass:3.1.0-rc4-dev
restart: always
ports:
- "80"
Expand Down
4 changes: 2 additions & 2 deletions sysPass-php7.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN git clone --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git

FROM php:7.1-apache-stretch as app

LABEL [email protected] version=3.1.0-rc3 php=7.1
LABEL [email protected] version=3.1.0-rc4 php=7.1

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

WORKDIR /var/www/html

LABEL build=19052502
LABEL build=19052503

# 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.1/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.1.0-rc3-php7.1
image: syspass/syspass:3.1.0-rc4-php7.1
restart: always
ports:
- "80"
Expand Down
4 changes: 2 additions & 2 deletions sysPass-php7.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN git clone --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git

FROM php:7.2-apache-stretch as app

LABEL [email protected] version=3.1.0-rc3 php=7.2
LABEL [email protected] version=3.1.0-rc4 php=7.2

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

WORKDIR /var/www/html

LABEL build=19052502
LABEL build=19052503

# 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.2/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.1.0-rc3-php7.2
image: syspass/syspass:3.1.0-rc4-php7.2
restart: always
ports:
- "80"
Expand Down
4 changes: 2 additions & 2 deletions sysPass-php7.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN git clone --branch ${SYSPASS_BRANCH} https://github.com/nuxsmin/sysPass.git

FROM php:7.3-apache-stretch as app

LABEL [email protected] version=3.1.0-rc3 php=7.3
LABEL [email protected] version=3.1.0-rc4 php=7.3

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

WORKDIR /var/www/html

LABEL build=19052502
LABEL build=19052503

# 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.1.0-rc3-php7.3
image: syspass/syspass:3.1.0-rc4-php7.3
restart: always
ports:
- "80"
Expand Down

0 comments on commit 340cb75

Please sign in to comment.