Skip to content

Commit 18ef5c1

Browse files
Merge branch 'pu/cw/addMarkdownInClient' into 'main'
feature(Tinebase): add clientside markdown support See merge request tine20/tine20!7183
2 parents e5f7fb6 + fbef953 commit 18ef5c1

File tree

8 files changed

+518
-71
lines changed

8 files changed

+518
-71
lines changed

ci/gitlab-ci/test_js_jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
- !reference [.lib-services, db_service]
2929
- !reference [.lib-services, redis_service]
3030
- !reference [.lib-services, mail_service]
31-
- name: ${UTIL_REGISTRY}/node:18.9.0-alpine-r1
31+
- name: ${UTIL_REGISTRY}/node:18.9.0-alpine-r2
3232
alias: webpack
3333
entrypoint:
3434
!reference [.lib, entry_points, tine_as_a_service_webpack]
@@ -129,7 +129,7 @@ js-e2e-tests-source-php-version-matrix:
129129
- !reference [.js-e2e-tests-source, rules]
130130

131131
js-unit-tests:
132-
image: ${UTIL_REGISTRY}/node:18.9.0-alpine-r1
132+
image: ${UTIL_REGISTRY}/node:18.9.0-alpine-r2
133133
stage: test
134134
needs: []
135135
timeout: 30m

ci/helperimages/node/.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.9.0-alpine-r1
1+
18.9.0-alpine-r2

ci/helperimages/node/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
FROM node:18.9.0-alpine
22

3-
RUN apk add bash git
3+
RUN apk add bash git python3 make gcc g++
4+
RUN mkdir -p /.cache/node-gyp/ && chmod 777 /.cache/node-gyp/

0 commit comments

Comments
 (0)