Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
curtisdelicata committed Jun 30, 2024
1 parent b409f94 commit aba0188
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 24 deletions.
49 changes: 27 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,6 @@ ARG PHP_VERSION=8.3

ARG COMPOSER_VERSION=latest

###########################################
# Build frontend assets with NPM
###########################################

ARG NODE_VERSION=20-alpine

FROM node:${NODE_VERSION} AS build

ENV ROOT=/var/www/html

WORKDIR ${ROOT}

RUN npm config set update-notifier false && npm set progress=false

COPY package*.json ./

RUN npm install --loglevel=error --no-audit

COPY . .

RUN npm run build

###########################################

FROM composer:${COMPOSER_VERSION} AS vendor
Expand Down Expand Up @@ -154,6 +132,33 @@ RUN composer install \
--no-dev \
&& composer clear-cache


###########################################
# Build frontend assets with NPM
###########################################

ARG NODE_VERSION=20-alpine

FROM node:${NODE_VERSION} AS build

ENV ROOT=/var/www/html

WORKDIR ${ROOT}

RUN npm config set update-notifier false && npm set progress=false

COPY package*.json ./

RUN npm install --loglevel=error --no-audit

COPY . .

RUN npm run build





RUN chmod +x /usr/local/bin/start-container

RUN cat .docker/utilities.sh >> ~/.bashrc
Expand Down
1 change: 0 additions & 1 deletion public/build/assets/app-CzGLRWOp.css

This file was deleted.

2 changes: 1 addition & 1 deletion public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resources/css/app.css": {
"file": "assets/app-CzGLRWOp.css",
"file": "assets/app-sKfczuAH.css",
"src": "resources/css/app.css",
"isEntry": true
},
Expand Down

0 comments on commit aba0188

Please sign in to comment.