ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 15:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(docker): fix on build copy command failing when branding (#8996)

Browse Source
This commit is contained in:
Ulf Gebhardt 2025-10-30 22:16:14 +01:00 committed by GitHub
parent 49e6f0b7e8
commit 09327ddc01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/Dockerfile
View File

@ -29,7 +29,9 @@ CMD ["/bin/bash", "-c", "yarn install && yarn run dev"]
FROM base AS build FROM base AS build
COPY webapp/ . COPY webapp/ .
ONBUILD COPY webapp/branding . # branding is unified in /branding in branding repositories
ONBUILD COPY webap[p]/brandin[g]/ .
ONBUILD COPY brandin[g]/ .
ONBUILD RUN tools/merge-locales.sh ONBUILD RUN tools/merge-locales.sh
ONBUILD RUN yarn install --production=false --frozen-lockfile --non-interactive ONBUILD RUN yarn install --production=false --frozen-lockfile --non-interactive
ONBUILD RUN yarn run build ONBUILD RUN yarn run build
@ -38,7 +40,7 @@ ONBUILD RUN cp -r ./.nuxt /build
ONBUILD RUN cp -r ./nuxt.config.js /build ONBUILD RUN cp -r ./nuxt.config.js /build
# Copy static files # Copy static files
# TODO - this seems not be needed anymore for the new rebranding # TODO - this seems not be needed anymore for the new rebranding
# TODO - this should be one Folder containign all stuff needed to be copied # TODO - this should be one Folder containing all stuff needed to be copied
ONBUILD RUN cp -r ./config/ /build ONBUILD RUN cp -r ./config/ /build
ONBUILD RUN cp -r ./constants /build ONBUILD RUN cp -r ./constants /build
ONBUILD RUN cp -r ./static /build ONBUILD RUN cp -r ./static /build

4
webapp/Dockerfile.maintenance
View File

@ -25,7 +25,9 @@ WORKDIR /app
COPY webapp/ . COPY webapp/ .
# Delete all Pages # Delete all Pages
RUN rm -rf ./pages RUN rm -rf ./pages
ONBUILD COPY webapp/branding . # branding is unified in /branding in branding repositories
ONBUILD COPY webap[p]/brandin[g]/ .
ONBUILD COPY brandin[g]/ .
ONBUILD RUN tools/merge-locales.sh ONBUILD RUN tools/merge-locales.sh
ONBUILD RUN yarn install --production=false --frozen-lockfile --non-interactive ONBUILD RUN yarn install --production=false --frozen-lockfile --non-interactive
ONBUILD RUN cp -r maintenance/source/* ./ ONBUILD RUN cp -r maintenance/source/* ./