Skip to content

Commit 5c3b4d8

Browse files
TecnobutrulTecnobutrul
committed
Merge branch 'release/4.0.0'
2 parents 402f9e4 + 809fa08 commit 5c3b4d8

File tree

14 files changed

+130
-105
lines changed

14 files changed

+130
-105
lines changed

‎.gitignore‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,10 @@
1-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
2-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
3-
4-
# IDE and editor specific files
5-
/nbproject
6-
.idea
7-
8-
# mpeltonen/sbt-idea plugin
9-
.idea_modules/
10-
11-
## File-based project format:
12-
*.iws
13-
14-
## Plugin-specific files:
15-
16-
# IntelliJ
17-
/out/
18-
19-
# JIRA plugin
20-
atlassian-ide-plugin.xml
21-
22-
# Crashlytics plugin (for Android Studio and IntelliJ)
23-
com_crashlytics_export_strings.xml
24-
crashlytics.properties
25-
crashlytics-build.properties
26-
fabric.properties
27-
281
# Generated docker files
292
conf/*.key
303

31-
# src directory used for local development
32-
src
33-
34-
.ruby-version
35-
364
.bundle
375

386
# docker compose specific
397
dev/.env
40-
41-
# Vim session files
428
*.vim
9+
vendor
10+
*subscription_key.txt

‎.gitlab-ci/Jobs/build_image.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ build-ce-stable-docker:
5959
DOCKERFILE_PATH: "debian/Dockerfile"
6060
DOCKER_TAG: "root"
6161
SUPERCRONIC_ARCH: amd64
62-
SUPERCRONIC_SHA1SUM: 2319da694833c7a147976b8e5f337cd83397d6be
62+
SUPERCRONIC_SHA1SUM: 642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49
6363
PLATFORM: "linux/amd64"
6464

6565
build-ce-stable-rootless:
@@ -68,7 +68,7 @@ build-ce-stable-rootless:
6868
DOCKERFILE_PATH: "debian/Dockerfile.rootless"
6969
DOCKER_TAG: "rootless"
7070
SUPERCRONIC_ARCH: amd64
71-
SUPERCRONIC_SHA1SUM: 2319da694833c7a147976b8e5f337cd83397d6be
71+
SUPERCRONIC_SHA1SUM: 642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49
7272
PLATFORM: "linux/amd64"
7373

7474
build-pro-stable-docker:
@@ -77,7 +77,7 @@ build-pro-stable-docker:
7777
DOCKERFILE_PATH: "debian/Dockerfile"
7878
DOCKER_TAG: "root"
7979
SUPERCRONIC_ARCH: amd64
80-
SUPERCRONIC_SHA1SUM: 2319da694833c7a147976b8e5f337cd83397d6be
80+
SUPERCRONIC_SHA1SUM: 642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49
8181
PLATFORM: "linux/amd64"
8282

8383
build-pro-stable-rootless:
@@ -86,7 +86,7 @@ build-pro-stable-rootless:
8686
DOCKERFILE_PATH: "debian/Dockerfile.rootless"
8787
DOCKER_TAG: "rootless"
8888
SUPERCRONIC_ARCH: amd64
89-
SUPERCRONIC_SHA1SUM: 2319da694833c7a147976b8e5f337cd83397d6be
89+
SUPERCRONIC_SHA1SUM: 642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49
9090
PLATFORM: "linux/amd64"
9191

9292
build-ce-stable-docker-arm64-v8:
@@ -98,7 +98,7 @@ build-ce-stable-docker-arm64-v8:
9898
DOCKER_TAG: "root-arm64-v8"
9999
PLATFORM: "linux/arm64/v8"
100100
SUPERCRONIC_ARCH: arm64
101-
SUPERCRONIC_SHA1SUM: c7d51b610d96a9a58d5eef0308922acc8be62eac
101+
SUPERCRONIC_SHA1SUM: 0b658d66bd54cf10aeccd9bdbd95fc7d9ba84a61
102102

103103
build-ce-stable-rootless-arm64-v8:
104104
tags:
@@ -109,7 +109,7 @@ build-ce-stable-rootless-arm64-v8:
109109
DOCKER_TAG: "rootless-arm64-v8"
110110
PLATFORM: "linux/arm64/v8"
111111
SUPERCRONIC_ARCH: arm64
112-
SUPERCRONIC_SHA1SUM: c7d51b610d96a9a58d5eef0308922acc8be62eac
112+
SUPERCRONIC_SHA1SUM: 0b658d66bd54cf10aeccd9bdbd95fc7d9ba84a61
113113

114114
build-pro-stable-docker-arm64-v8:
115115
tags:
@@ -120,7 +120,7 @@ build-pro-stable-docker-arm64-v8:
120120
DOCKER_TAG: "root-arm64-v8"
121121
PLATFORM: "linux/arm64/v8"
122122
SUPERCRONIC_ARCH: arm64
123-
SUPERCRONIC_SHA1SUM: c7d51b610d96a9a58d5eef0308922acc8be62eac
123+
SUPERCRONIC_SHA1SUM: 0b658d66bd54cf10aeccd9bdbd95fc7d9ba84a61
124124

125125
build-pro-stable-rootless-arm64-v8:
126126
tags:
@@ -131,7 +131,7 @@ build-pro-stable-rootless-arm64-v8:
131131
DOCKER_TAG: "rootless-arm64-v8"
132132
PLATFORM: "linux/arm64/v8"
133133
SUPERCRONIC_ARCH: arm64
134-
SUPERCRONIC_SHA1SUM: c7d51b610d96a9a58d5eef0308922acc8be62eac
134+
SUPERCRONIC_SHA1SUM: 0b658d66bd54cf10aeccd9bdbd95fc7d9ba84a61
135135

136136
build-ce-stable-docker-arm-v5:
137137
tags:
@@ -142,7 +142,7 @@ build-ce-stable-docker-arm-v5:
142142
DOCKER_TAG: "root-arm-v5"
143143
PLATFORM: "linux/arm/v5"
144144
SUPERCRONIC_ARCH: arm
145-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
145+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
146146

147147
build-ce-stable-rootless-arm-v5:
148148
tags:
@@ -153,7 +153,7 @@ build-ce-stable-rootless-arm-v5:
153153
DOCKER_TAG: "rootless-arm-v5"
154154
PLATFORM: "linux/arm/v5"
155155
SUPERCRONIC_ARCH: arm
156-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
156+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
157157

158158
build-pro-stable-docker-arm-v5:
159159
tags:
@@ -164,7 +164,7 @@ build-pro-stable-docker-arm-v5:
164164
DOCKER_TAG: "root-arm-v5"
165165
PLATFORM: "linux/arm/v5"
166166
SUPERCRONIC_ARCH: arm
167-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
167+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
168168

169169
build-pro-stable-rootless-arm-v5:
170170
tags:
@@ -175,7 +175,7 @@ build-pro-stable-rootless-arm-v5:
175175
DOCKER_TAG: "rootless-arm-v5"
176176
PLATFORM: "linux/arm/v5"
177177
SUPERCRONIC_ARCH: arm
178-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
178+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
179179

180180
build-ce-stable-docker-arm-v7:
181181
tags:
@@ -186,7 +186,7 @@ build-ce-stable-docker-arm-v7:
186186
DOCKER_TAG: "root-arm-v7"
187187
PLATFORM: "linux/arm/v7"
188188
SUPERCRONIC_ARCH: arm
189-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
189+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
190190

191191
build-ce-stable-rootless-arm-v7:
192192
tags:
@@ -197,7 +197,7 @@ build-ce-stable-rootless-arm-v7:
197197
DOCKER_TAG: "rootless-arm-v7"
198198
PLATFORM: "linux/arm/v7"
199199
SUPERCRONIC_ARCH: arm
200-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
200+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
201201

202202
build-pro-stable-docker-arm-v7:
203203
tags:
@@ -208,7 +208,7 @@ build-pro-stable-docker-arm-v7:
208208
DOCKER_TAG: "root-arm-v7"
209209
PLATFORM: "linux/arm/v7"
210210
SUPERCRONIC_ARCH: arm
211-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
211+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be
212212

213213
build-pro-stable-rootless-arm-v7:
214214
tags:
@@ -219,4 +219,4 @@ build-pro-stable-rootless-arm-v7:
219219
DOCKER_TAG: "rootless-arm-v7"
220220
PLATFORM: "linux/arm/v7"
221221
SUPERCRONIC_ARCH: arm
222-
SUPERCRONIC_SHA1SUM: f6a61efbdd9a223e750aa03d16bbc417113a64d9
222+
SUPERCRONIC_SHA1SUM: 4f625d77d2f9a790ea4ad679d0d2c318a14ec3be

‎.gitlab-ci/Jobs/publish.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ publish-ce:
9999
- crane cp "${CI_REGISTRY_IMAGE}:latest-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:latest-${PASSBOLT_IMAGE_FLAVOUR}"
100100
- crane cp "${CI_REGISTRY_IMAGE}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}"
101101
- crane cp "${CI_REGISTRY_IMAGE}:latest" "${DOCKER_HUB_PASSBOLT_REGISTRY}:latest"
102-
102+
- 'bash .gitlab-ci/scripts/bin/slack-status-messages.sh ":whale: $PASSBOLT_VERSION $PASSBOLT_IMAGE_FLAVOUR docker image has been published" "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"'
103103
publish-ce-non-root:
104104
extends: .publish
105105
variables:
@@ -111,7 +111,7 @@ publish-ce-non-root:
111111
- ./manifest-tool-linux-amd64 push from-spec manifests.yaml
112112
- crane cp "${CI_REGISTRY_IMAGE}:latest-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:latest-${PASSBOLT_IMAGE_FLAVOUR}"
113113
- crane cp "${CI_REGISTRY_IMAGE}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}"
114-
114+
- 'bash .gitlab-ci/scripts/bin/slack-status-messages.sh ":whale: $PASSBOLT_VERSION $PASSBOLT_IMAGE_FLAVOUR docker image has been published" "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"'
115115
publish-pro:
116116
extends: .publish
117117
variables:
@@ -123,10 +123,10 @@ publish-pro:
123123
- ./manifest-tool-linux-amd64 push from-spec manifests.yaml
124124
- crane cp "${CI_REGISTRY_IMAGE}:latest-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:latest-${PASSBOLT_IMAGE_FLAVOUR}"
125125
- crane cp "${CI_REGISTRY_IMAGE}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}"
126+
- 'bash .gitlab-ci/scripts/bin/slack-status-messages.sh ":whale: $PASSBOLT_VERSION $PASSBOLT_IMAGE_FLAVOUR docker image has been published" "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"'
126127
rules:
127128
- if: '$PASSBOLT_VERSION && $CI_COMMIT_BRANCH == "master" && $PASSBOLT_PUBLISH == "pro"'
128129
when: on_success
129-
130130
publish-pro-non-root:
131131
extends: .publish
132132
variables:
@@ -138,6 +138,7 @@ publish-pro-non-root:
138138
- ./manifest-tool-linux-amd64 push from-spec manifests.yaml
139139
- crane cp "${CI_REGISTRY_IMAGE}:latest-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:latest-${PASSBOLT_IMAGE_FLAVOUR}"
140140
- crane cp "${CI_REGISTRY_IMAGE}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}" "${DOCKER_HUB_PASSBOLT_REGISTRY}:${PASSBOLT_VERSION}-${PASSBOLT_IMAGE_FLAVOUR}"
141+
- 'bash .gitlab-ci/scripts/bin/slack-status-messages.sh ":whale: $PASSBOLT_VERSION $PASSBOLT_IMAGE_FLAVOUR docker image has been published" "$CI_PROJECT_URL/-/jobs/$CI_JOB_ID"'
141142
rules:
142143
- if: '$PASSBOLT_VERSION && $CI_COMMIT_BRANCH == "master" && $PASSBOLT_PUBLISH == "pro"'
143144
when: on_success

‎.gitlab-ci/scripts/bin/slack-status-messages.sh‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#!/bin/bash
2+
3+
# Variables required
4+
# CI_PROJECT_NAME
5+
# CI_PIPELINE_ID
6+
# SLACK_CHANNEL_ID
7+
# SLACK_WEBHOOK
8+
9+
title="$1"
10+
url="$2"
11+
12+
curl -X POST -H 'Content-type: application/json' $SLACK_WEBHOOK \
13+
--data-binary @- <<EOF
14+
{
15+
"channel": "$SLACK_CHANNEL_ID",
16+
"attachments": [
17+
{
18+
"color": "#36A64F",
19+
"title": "$title",
20+
"attachment_type": "default",
21+
"actions": [
22+
{
23+
"name": "Logs",
24+
"text": "Logs",
25+
"type": "button",
26+
"style": "default",
27+
"url": "$url"
28+
},
29+
{
30+
"name": "DockerHub",
31+
"text": "DockerHub",
32+
"type": "button",
33+
"style": "primary",
34+
"url": "https://hub.docker.com/r/passbolt/passbolt/tags"
35+
}
36+
]
37+
}
38+
]
39+
}
40+
EOF
41+

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v3.10.0...HEAD)
5+
## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/4.0.0...HEAD)
6+
7+
## [4.0.0](https://github.com/passbolt/passbolt_docker/compare/v3.10.0...4.0.0) - 2023-06-15
8+
9+
### Changed
10+
- bookworm as base container
11+
- php version set to 8.2
12+
- Mariadb set to 10.11
13+
- Updated rootless superchronic to 0.2.25
14+
- Supervisor php-fpm command updated to php-fpm8.2
15+
- Small refactor in kitchen tests
616

717
## [3.10.0](https://github.com/passbolt/passbolt_docker/compare/v3.9.4...v3.10.0) - 2023-05-02
818

‎conf/supervisor/php.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[program:php-fpm]
2-
command=php-fpm7.4 -F
2+
command=php-fpm8.2 -F
33
autostart=true
44
priority=5
55
stdout_logfile=/dev/stdout

‎debian/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bullseye-slim
1+
FROM debian:bookworm-slim
22

33
LABEL maintainer="Passbolt SA <contact@passbolt.com>"
44

@@ -9,7 +9,7 @@ ARG PASSBOLT_SERVER_KEY="hkps://keys.mailvelope.com "
99
ARG PASSBOLT_REPO_URL="https://download.passbolt.com/$PASSBOLT_FLAVOUR/debian"
1010

1111
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
12-
ENV PHP_VERSION=7.4
12+
ENV PHP_VERSION=8.2
1313
ENV GNUPGHOME=/var/lib/passbolt/.gnupg
1414
ENV PASSBOLT_FLAVOUR=$PASSBOLT_FLAVOUR
1515
ENV PASSBOLT_PKG="passbolt-$PASSBOLT_FLAVOUR-server"
@@ -28,7 +28,6 @@ RUN apt-get update \
2828
curl \
2929
&& rm -f /etc/passbolt/jwt/* \
3030
&& rm /etc/nginx/sites-enabled/default \
31-
&& mkdir /run/php \
3231
&& cp /usr/share/passbolt/examples/nginx-passbolt-ssl.conf /etc/nginx/snippets/passbolt-ssl.conf \
3332
&& sed -i 's,;clear_env = no,clear_env = no,' /etc/php/$PHP_VERSION/fpm/pool.d/www.conf \
3433
&& 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
6362

6463
WORKDIR /usr/share/php/passbolt
6564

66-
CMD ["//docker-entrypoint.sh"]
65+
CMD ["/docker-entrypoint.sh"]

‎debian/Dockerfile.rootless‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM debian:bullseye-slim
1+
FROM debian:bookworm-slim
22

33
LABEL maintainer="Passbolt SA <contact@passbolt.com>"
44

55
ARG SUPERCRONIC_ARCH=amd64
6-
ARG SUPERCRONIC_SHA1SUM=2319da694833c7a147976b8e5f337cd83397d6be
6+
ARG SUPERCRONIC_SHA1SUM=642f4f5a2b67f3400b5ea71ff24f18c0a7d77d49
77

88
ARG PASSBOLT_DISTRO="buster"
99
ARG PASSBOLT_COMPONENT="stable"
@@ -13,9 +13,9 @@ ARG PASSBOLT_PKG=passbolt-$PASSBOLT_FLAVOUR-server
1313
ARG PASSBOLT_REPO_URL="https://download.passbolt.com/$PASSBOLT_FLAVOUR/debian"
1414

1515
ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
16-
ENV PHP_VERSION=7.4
16+
ENV PHP_VERSION=8.2
1717
ENV GNUPGHOME=/var/lib/passbolt/.gnupg
18-
ENV SUPERCRONIC_VERSION=0.2.2
18+
ENV SUPERCRONIC_VERSION=0.2.25
1919
ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v${SUPERCRONIC_VERSION}/supercronic-linux-${SUPERCRONIC_ARCH} \
2020
SUPERCRONIC=supercronic-linux-${SUPERCRONIC_ARCH}
2121
ENV PASSBOLT_FLAVOUR="${PASSBOLT_FLAVOUR}"

‎docker-compose/docker-compose-ce.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
version: '3.9'
1+
version: "3.9"
22
services:
33
db:
4-
image: mariadb:10.10
4+
image: mariadb:10.11
55
restart: unless-stopped
66
environment:
77
MYSQL_RANDOM_ROOT_PASSWORD: "true"
@@ -27,7 +27,15 @@ services:
2727
volumes:
2828
- gpg_volume:/etc/passbolt/gpg
2929
- jwt_volume:/etc/passbolt/jwt
30-
command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"]
30+
command:
31+
[
32+
"/usr/bin/wait-for.sh",
33+
"-t",
34+
"0",
35+
"db:3306",
36+
"--",
37+
"/docker-entrypoint.sh",
38+
]
3139
ports:
3240
- 80:80
3341
- 443:443

‎docker-compose/docker-compose-pro.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
version: '3.9'
1+
version: "3.9"
22
services:
33
db:
4-
image: mariadb:10.10
4+
image: mariadb:10.11
55
restart: unless-stopped
66
environment:
77
MYSQL_RANDOM_ROOT_PASSWORD: "true"

0 commit comments

Comments
 (0)