Skip to content

Commit b31ab3c

Browse files
committed
merge devel
2 parents 8a92eb2 + f4c26e4 commit b31ab3c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1440
-729
lines changed

.docker-hub/frontend/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# build stage
2-
FROM node:lts-alpine@sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 AS build-stage
2+
FROM node:lts-alpine@sha256:8f1827381eb7fca5a79ad21cb42e935546bedf67d9f668519a7db69d77d812bf AS build-stage
33

44
COPY common /common
55

66
WORKDIR /app
77
COPY frontend/package*.json ./
8-
RUN npm ci
8+
# install and uninstall the native dependencies in one single docker RUN instruction,
9+
# so they do not increase the image layer size
10+
RUN apk --no-cache add --virtual native-deps g++ make python3 && npm ci && apk del native-deps
911
COPY frontend .
1012
RUN npm run build
1113

.docker-hub/print/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build stage
2-
FROM node:16.12.0@sha256:922d9e469a2fcd2554acd5c309c1d5a6306cb5483fc5a45b14c8d1bb775c5ecb AS build-stage
2+
FROM node:16.13.0@sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 AS build-stage
33

44
COPY common /common
55

@@ -10,7 +10,7 @@ RUN npm ci
1010
RUN npm run build
1111

1212
# production stage
13-
FROM node:16.12.0@sha256:922d9e469a2fcd2554acd5c309c1d5a6306cb5483fc5a45b14c8d1bb775c5ecb AS production-stage
13+
FROM node:16.13.0@sha256:683b8ea4ebc033a0f9060501fc31c1481d3f7232cc032851abbd8cc8d91fdff7 AS production-stage
1414
WORKDIR /app
1515

1616
COPY --from=build-stage /app/node_modules ./node_modules

.docker-hub/worker-print-puppeteer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:16.12.0-buster-slim@sha256:b87c66e970096577f611d4c39a774842daaf40fddd90e5be56b327de1a930e16
1+
FROM node:16.13.0-buster-slim@sha256:9ec1ff69c844f2de3a6a2180cd49ca75797d9f2a0fc52bb33c8a672fd0fe7e18
22

33
RUN apt-get update \
44
&& apt-get install -y wget gnupg \

.docker-hub/worker-print-weasy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10@sha256:d0075399d5663b0d8619d0260dddccee7b2ee8e6c66be441ba088607d3cc7e05
1+
FROM python:3.10@sha256:a487658b37559c499868dd4bdcdc6b18ed25cbfb5a02d054c9eaefaf713d5aca
22

33
# install all the dependencies except libcairo2 from jessie, then install libcairo2 from stretch
44
RUN apt-get -y update \

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ jobs:
268268

269269
- run: bash wait-for-container-startup.sh
270270

271-
- run: docker run -v $PWD:/e2e -w /e2e --network host -e CYPRESS_BASE_URL=http://localhost:3000 cypress/included:8.6.0
271+
- run: docker run -v $PWD:/e2e -w /e2e --network host -e CYPRESS_BASE_URL=http://localhost:3000 cypress/included:8.7.0
272272
working-directory: frontend
273273

274274
coveralls-finished:

api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RUN set -eux; \
6363
###> recipes ###
6464
###< recipes ###
6565

66-
COPY --from=composer:2.1@sha256:a98a93577641eabe5aa7c37a712e3f0a66b9b69146d16f176e489de4afaf4649 /usr/bin/composer /usr/bin/composer
66+
COPY --from=composer:2.1@sha256:0571e40f49f0b1b65c51d297b292d127584d299bb0fde3cc9015be7349ac734b /usr/bin/composer /usr/bin/composer
6767

6868
# Copy development php.ini
6969
RUN cp "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"

api/composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@
1414
"doctrine/orm": "2.10.2",
1515
"exercise/htmlpurifier-bundle": "3.1.0",
1616
"guzzlehttp/guzzle": "7.4.0",
17-
"lexik/jwt-authentication-bundle": "2.13.0",
17+
"lexik/jwt-authentication-bundle": "2.14.1",
1818
"nelmio/cors-bundle": "2.1.1",
1919
"phpdocumentor/reflection-docblock": "5.3.0",
2020
"rize/uri-template": "0.3.4",
2121
"stof/doctrine-extensions-bundle": "1.6.0",
2222
"swaggest/json-schema": "0.12.39",
2323
"symfony/asset": "5.3.4",
24-
"symfony/console": "5.3.7",
25-
"symfony/dotenv": "5.3.8",
24+
"symfony/console": "5.3.10",
25+
"symfony/dotenv": "5.3.10",
2626
"symfony/expression-language": "5.3.7",
2727
"symfony/flex": "1.17.2",
28-
"symfony/framework-bundle": "5.3.8",
28+
"symfony/framework-bundle": "5.3.10",
2929
"symfony/intl": "5.3.8",
3030
"symfony/mailer": "5.3.9",
3131
"symfony/mercure-bundle": "0.3.3",
3232
"symfony/monolog-bundle": "3.7.0",
3333
"symfony/property-access": "5.3.8",
3434
"symfony/property-info": "5.3.8",
35-
"symfony/runtime": "5.3.4",
35+
"symfony/runtime": "5.3.10",
3636
"symfony/security-bundle": "5.3.8",
37-
"symfony/serializer": "5.3.8",
38-
"symfony/twig-bundle": "5.3.4",
39-
"symfony/validator": "5.3.8",
37+
"symfony/serializer": "5.3.10",
38+
"symfony/twig-bundle": "5.3.10",
39+
"symfony/validator": "5.3.10",
4040
"symfony/yaml": "5.3.6",
41-
"webonyx/graphql-php": "14.9.0"
41+
"webonyx/graphql-php": "14.11.0"
4242
},
4343
"require-dev": {
4444
"friendsofphp/php-cs-fixer": "3.2.1",
@@ -49,11 +49,11 @@
4949
"symfony/browser-kit": "5.3.4",
5050
"symfony/css-selector": "5.3.4",
5151
"symfony/debug-bundle": "5.3.4",
52-
"symfony/http-client": "5.3.8",
52+
"symfony/http-client": "5.3.10",
5353
"symfony/maker-bundle": "1.34.1",
54-
"symfony/phpunit-bridge": "5.3.8",
54+
"symfony/phpunit-bridge": "5.3.10",
5555
"symfony/stopwatch": "5.3.4",
56-
"symfony/var-dumper": "5.3.8",
56+
"symfony/var-dumper": "5.3.10",
5757
"symfony/web-profiler-bundle": "5.3.8"
5858
},
5959
"config": {

0 commit comments

Comments
 (0)