From fb6d0ace3189f6e3db22f6dfdfd0ad2091fd1cbf Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 1 Dec 2022 12:29:30 +0100 Subject: [PATCH 1/2] feat(webapp): copy fonts from assets --- docker/webapp.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/webapp.Dockerfile b/docker/webapp.Dockerfile index ba7cbffb0..a07695b9a 100644 --- a/docker/webapp.Dockerfile +++ b/docker/webapp.Dockerfile @@ -17,6 +17,7 @@ COPY branding/locales/html/ locales/html/ # COPY branding/locales/index.js locales/index.js COPY branding/locales/*.json locales/tmp/ COPY branding/assets/styles/imports/ assets/styles/imports/ +COPY branding/assets/fonts/ assets/fonts/ RUN apk add --no-cache bash jq @@ -50,6 +51,7 @@ COPY --from=build ${DOCKER_WORKDIR}/constants ./constants COPY --from=build ${DOCKER_WORKDIR}/static ./static COPY --from=build ${DOCKER_WORKDIR}/locales ./locales COPY --from=build ${DOCKER_WORKDIR}/assets/styles/imports ./assets/styles/imports +COPY --from=build ${DOCKER_WORKDIR}/assets/fonts ./assets/fonts # Copy package.json for script definitions (lock file should not be needed) COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json From 6e85677b48caac0c515ac73c55b4846d559eb364 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 6 Dec 2022 10:18:33 +0100 Subject: [PATCH 2/2] adjusted ocelotDockerVersionTag --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9625605f2..b5dbca69e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", "version": "2.2.0", - "ocelotDockerVersionTag": "2.2.0-267", + "ocelotDockerVersionTag": "2.3.0-281", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community",