-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
130 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,10 @@ | ||
| # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm | ||
| # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 | ||
|
|
||
| # IDE and editor specific files | ||
| /nbproject | ||
| .idea | ||
|
|
||
| # mpeltonen/sbt-idea plugin | ||
| .idea_modules/ | ||
|
|
||
| ## File-based project format: | ||
| *.iws | ||
|
|
||
| ## Plugin-specific files: | ||
|
|
||
| # IntelliJ | ||
| /out/ | ||
|
|
||
| # JIRA plugin | ||
| atlassian-ide-plugin.xml | ||
|
|
||
| # Crashlytics plugin (for Android Studio and IntelliJ) | ||
| com_crashlytics_export_strings.xml | ||
| crashlytics.properties | ||
| crashlytics-build.properties | ||
| fabric.properties | ||
|
|
||
| # Generated docker files | ||
| conf/*.key | ||
|
|
||
| # src directory used for local development | ||
| src | ||
|
|
||
| .ruby-version | ||
|
|
||
| .bundle | ||
|
|
||
| # docker compose specific | ||
| dev/.env | ||
|
|
||
| # Vim session files | ||
| *.vim | ||
| vendor | ||
| *subscription_key.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Variables required | ||
| # CI_PROJECT_NAME | ||
| # CI_PIPELINE_ID | ||
| # SLACK_CHANNEL_ID | ||
| # SLACK_WEBHOOK | ||
|
|
||
| title="$1" | ||
| url="$2" | ||
|
|
||
| curl -X POST -H 'Content-type: application/json' $SLACK_WEBHOOK \ | ||
| --data-binary @- <<EOF | ||
| { | ||
| "channel": "$SLACK_CHANNEL_ID", | ||
| "attachments": [ | ||
| { | ||
| "color": "#36A64F", | ||
| "title": "$title", | ||
| "attachment_type": "default", | ||
| "actions": [ | ||
| { | ||
| "name": "Logs", | ||
| "text": "Logs", | ||
| "type": "button", | ||
| "style": "default", | ||
| "url": "$url" | ||
| }, | ||
| { | ||
| "name": "DockerHub", | ||
| "text": "DockerHub", | ||
| "type": "button", | ||
| "style": "primary", | ||
| "url": "https://hub.docker.com/r/passbolt/passbolt/tags" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| EOF | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM debian:bullseye-slim | ||
| FROM debian:bookworm-slim | ||
|
|
||
| LABEL maintainer="Passbolt SA <[email protected]>" | ||
|
|
||
|
|
@@ -9,7 +9,7 @@ ARG PASSBOLT_SERVER_KEY="hkps://keys.mailvelope.com " | |
| ARG PASSBOLT_REPO_URL="https://download.passbolt.com/$PASSBOLT_FLAVOUR/debian" | ||
|
|
||
| ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D | ||
| ENV PHP_VERSION=7.4 | ||
| ENV PHP_VERSION=8.2 | ||
| ENV GNUPGHOME=/var/lib/passbolt/.gnupg | ||
| ENV PASSBOLT_FLAVOUR=$PASSBOLT_FLAVOUR | ||
| ENV PASSBOLT_PKG="passbolt-$PASSBOLT_FLAVOUR-server" | ||
|
|
@@ -28,7 +28,6 @@ RUN apt-get update \ | |
| curl \ | ||
| && rm -f /etc/passbolt/jwt/* \ | ||
| && rm /etc/nginx/sites-enabled/default \ | ||
| && mkdir /run/php \ | ||
| && cp /usr/share/passbolt/examples/nginx-passbolt-ssl.conf /etc/nginx/snippets/passbolt-ssl.conf \ | ||
| && sed -i 's,;clear_env = no,clear_env = no,' /etc/php/$PHP_VERSION/fpm/pool.d/www.conf \ | ||
| && sed -i 's,# include __PASSBOLT_SSL__,include /etc/nginx/snippets/passbolt-ssl.conf;,' /etc/nginx/sites-enabled/nginx-passbolt.conf \ | ||
|
|
@@ -63,4 +62,4 @@ EXPOSE 80 443 | |
|
|
||
| WORKDIR /usr/share/php/passbolt | ||
|
|
||
| CMD ["//docker-entrypoint.sh"] | ||
| CMD ["/docker-entrypoint.sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| FROM debian:bullseye-slim | ||
| FROM debian:bookworm-slim | ||
|
|
||
| LABEL maintainer="Passbolt SA <[email protected]>" | ||
|
|
||
| ARG SUPERCRONIC_ARCH=amd64 | ||
| ARG SUPERCRONIC_SHA1SUM=2319da694833c7a147976b8e5f337cd83397d6be | ||
| ARG SUPERCRONIC_SHA1SUM=642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49 | ||
|
|
||
| ARG PASSBOLT_DISTRO="buster" | ||
| ARG PASSBOLT_COMPONENT="stable" | ||
|
|
@@ -13,9 +13,9 @@ ARG PASSBOLT_PKG=passbolt-$PASSBOLT_FLAVOUR-server | |
| ARG PASSBOLT_REPO_URL="https://download.passbolt.com/$PASSBOLT_FLAVOUR/debian" | ||
|
|
||
| ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D | ||
| ENV PHP_VERSION=7.4 | ||
| ENV PHP_VERSION=8.2 | ||
| ENV GNUPGHOME=/var/lib/passbolt/.gnupg | ||
| ENV SUPERCRONIC_VERSION=0.2.2 | ||
| ENV SUPERCRONIC_VERSION=0.2.25 | ||
| ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${SUPERCRONIC_ARCH} \ | ||
| SUPERCRONIC=supercronic-linux-${SUPERCRONIC_ARCH} | ||
| ENV PASSBOLT_FLAVOUR="${PASSBOLT_FLAVOUR}" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.