Skip to content

Commit 4ef68b5

Browse files
authored
add tchap files in docker build (#27)
* add tchap resources
1 parent b22910b commit 4ef68b5

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

.github/actions/build-frontend/action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ runs:
2020
shell: sh
2121

2222
- name: Build the frontend assets
23-
#:tchap:
24-
# run: npm run build
25-
run: npm run build-tchap
26-
#:tchap:
23+
run: npm run build
2724
working-directory: ./frontend
2825
shell: sh

.github/workflows/build.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
# SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
44
# Please see LICENSE files in the repository root for full details.
55

6+
7+
#:tchap:
8+
# the only job used by tchap are `compute-version` and `build-image`
9+
#:tchap:
10+
611
name: Build
712

813
on:
@@ -81,10 +86,6 @@ jobs:
8186
cp -r frontend/dist/ assets-dist/share/assets
8287
cp -r templates/ assets-dist/share/templates
8388
cp -r translations/ assets-dist/share/translations
84-
#:tchap:
85-
cp -r tchap/resources/templates/* assets-dist/share/templates/
86-
cp -r tchap/resources/translations/* assets-dist/share/translations/
87-
#:tchap: end
8889
cp LICENSE assets-dist/LICENSE
8990
chmod -R u=rwX,go=rX assets-dist/
9091

Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
# implicit BUILDARG: BUILDPLATFORM being the host platform and TARGETPLATFORM
1010
# being the platform being built.
1111

12+
#:tchap:
13+
# tchap files are added to this image (templates, translations, css)
14+
#:tchap:
15+
1216
# The Debian version and version name must be in sync
1317
ARG DEBIAN_VERSION=12
1418
ARG DEBIAN_VERSION_NAME=bookworm
@@ -32,7 +36,9 @@ RUN --network=default \
3236
COPY ./frontend/ /app/frontend/
3337
COPY ./templates/ /app/templates/
3438
RUN --network=none \
35-
npm run build
39+
#:tchap:
40+
npm run build-tchap
41+
#:tchap:
3642

3743
# Move the built files
3844
RUN --network=none \
@@ -141,6 +147,12 @@ COPY --from=policy /app/policies/policy.wasm /share/policy.wasm
141147
COPY ./templates/ /share/templates
142148
COPY ./translations/ /share/translations
143149

150+
#:tchap:
151+
COPY ./tchap/resources/templates/ /share/templates/
152+
COPY ./tchap/resources/translations/ /share/translations/
153+
#:tchap:
154+
155+
144156
##################################
145157
## Runtime stage, debug variant ##
146158
##################################

0 commit comments

Comments
 (0)