CommunEu
/
Passbolt
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/v3.2.0-1'

This commit is contained in:
Daniel Del Rio Figueira 2021-06-03 10:55:32 +02:00
parent d5d9129cb8 fbbb3e69c2
commit 70345db90f
No known key found for this signature in database
GPG Key ID: DCB25219AF061D1B
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/Dockerfile vendored
View File

@ -7,6 +7,7 @@ ARG PASSBOLT_DISTRO="buster"
ARG PASSBOLT_COMPONENT="stable" ARG PASSBOLT_COMPONENT="stable"
ARG PASSBOLT_PKG=passbolt-ce-server ARG PASSBOLT_PKG=passbolt-ce-server
ARG PASSBOLT_FLAVOUR="ce" ARG PASSBOLT_FLAVOUR="ce"
ARG PASSBOLT_SERVER_KEY="hkps://keys.mailvelope.com "
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
ENV PHP_VERSION=7.3 ENV PHP_VERSION=7.3
@ -17,7 +18,7 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=non-interactive apt-get -y install \ && DEBIAN_FRONTEND=non-interactive apt-get -y install \
ca-certificates \ ca-certificates \
gnupg \ gnupg \
&& apt-key adv --keyserver keys.gnupg.net --recv-keys $PASSBOLT_PKG_KEY \ && apt-key adv --keyserver $PASSBOLT_SERVER_KEY --recv-keys $PASSBOLT_PKG_KEY \
&& echo "deb $PASSBOLT_REPO_URL $PASSBOLT_DISTRO $PASSBOLT_COMPONENT" > /etc/apt/sources.list.d/passbolt.list \ && echo "deb $PASSBOLT_REPO_URL $PASSBOLT_DISTRO $PASSBOLT_COMPONENT" > /etc/apt/sources.list.d/passbolt.list \
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=non-interactive apt-get -y install --no-install-recommends \ && DEBIAN_FRONTEND=non-interactive apt-get -y install --no-install-recommends \

3
debian/Dockerfile.rootless vendored
View File

@ -7,6 +7,7 @@ ARG PASSBOLT_REPO_URL="https://download.passbolt.com/ce/debian"
ARG PASSBOLT_DISTRO="buster" ARG PASSBOLT_DISTRO="buster"
ARG PASSBOLT_COMPONENT="stable" ARG PASSBOLT_COMPONENT="stable"
ARG PASSBOLT_PKG=passbolt-ce-server ARG PASSBOLT_PKG=passbolt-ce-server
ARG PASSBOLT_SERVER_KEY="hkps://keys.mailvelope.com "
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
ENV PHP_VERSION=7.3 ENV PHP_VERSION=7.3
@ -20,7 +21,7 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=non-interactive apt-get -y install \ && DEBIAN_FRONTEND=non-interactive apt-get -y install \
ca-certificates \ ca-certificates \
gnupg \ gnupg \
&& apt-key adv --keyserver keys.gnupg.net --recv-keys $PASSBOLT_PKG_KEY \ && apt-key adv --keyserver $PASSBOLT_SERVER_KEY --recv-keys $PASSBOLT_PKG_KEY \
&& echo "deb $PASSBOLT_REPO_URL $PASSBOLT_DISTRO $PASSBOLT_COMPONENT" > /etc/apt/sources.list.d/passbolt.list \ && echo "deb $PASSBOLT_REPO_URL $PASSBOLT_DISTRO $PASSBOLT_COMPONENT" > /etc/apt/sources.list.d/passbolt.list \
&& apt-get update \ && apt-get update \
&& DEBIAN_FRONTEND=non-interactive apt-get -y install --no-install-recommends \ && DEBIAN_FRONTEND=non-interactive apt-get -y install --no-install-recommends \