Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for broken build pipeline #560

Merged
merged 2 commits into from
Jan 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions alpine/5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/

# Get Invoice Ninja and install nodejs packages
FROM --platform=$BUILDPLATFORM node:20-alpine as build
FROM --platform=$BUILDPLATFORM node:lts-alpine as build

# Download Invoice Ninja
ARG INVOICENINJA_VERSION
Expand All @@ -29,20 +29,11 @@ RUN cp -r dist/tinymce_6.4.2/* /var/www/app/public/tinymce_6.4.2/

# Download and extract the latest react application
#
WORKDIR /var/www/app/

# Install node packages
ARG BAK_STORAGE_PATH
ARG BAK_PUBLIC_PATH
RUN --mount=target=/var/www/app/node_modules,type=cache \
npm install \
&& npm run production \
&& mv /var/www/app/storage $BAK_STORAGE_PATH \
&& mv /var/www/app/public $BAK_PUBLIC_PATH

# Prepare php image
FROM php:${PHP_VERSION}-fpm-alpine as prod

COPY --from=build / /

LABEL maintainer="David Bomba <[email protected]>"

# Adding caching_sha2_password.so
Expand Down Expand Up @@ -109,6 +100,16 @@ ENV IS_DOCKER true
RUN /usr/local/bin/composer install --no-dev --no-scripts --no-interaction
RUN /usr/local/bin/composer dump-autoload --optimize --no-dev --classmap-authoritative --no-scripts --no-interaction

WORKDIR /var/www/app/

# Install node packages
ARG BAK_STORAGE_PATH
ARG BAK_PUBLIC_PATH
RUN npm install
RUN npm run production
RUN mv /var/www/app/storage $BAK_STORAGE_PATH
RUN mv /var/www/app/public $BAK_PUBLIC_PATH

# Override the environment settings from projects .env file
ENV APP_ENV production
ENV LOG errorlog
Expand Down
Loading