diff --git a/webapp/Dockerfile b/webapp/Dockerfile index e0ab2dad1..d60c19c86 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -29,7 +29,9 @@ CMD ["/bin/bash", "-c", "yarn install && yarn run dev"] FROM base AS build 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 yarn install --production=false --frozen-lockfile --non-interactive ONBUILD RUN yarn run build @@ -38,7 +40,7 @@ ONBUILD RUN cp -r ./.nuxt /build ONBUILD RUN cp -r ./nuxt.config.js /build # Copy static files # 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 ./constants /build ONBUILD RUN cp -r ./static /build diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index 93943977a..2ad52c176 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -25,7 +25,9 @@ WORKDIR /app COPY webapp/ . # Delete all 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 yarn install --production=false --frozen-lockfile --non-interactive ONBUILD RUN cp -r maintenance/source/* ./