diff --git a/admin/Dockerfile b/admin/Dockerfile index 8194d635..b7cfefbf 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -11,8 +11,8 @@ ARG build_dir WORKDIR /app COPY ./libs ./libs COPY ./${build_dir} ./${build_dir} -RUN cd libs && npm ci && cd .. && \ - cd ${build_dir} && npm ci && npm run build:${build_dir} && cd .. && \ +RUN cd libs && npm ci --ignore-scripts && cd .. && \ + cd ${build_dir} && npm ci --ignore-scripts && npm run build:${build_dir} && cd .. && \ rm -rf libs/node_modules ${build_dir}/node_modules diff --git a/api/Dockerfile b/api/Dockerfile index 57c19904..7f113589 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -6,8 +6,8 @@ WORKDIR /app COPY . ./ USER root RUN dnf install -y ca-certificates && \ - cd libs && npm ci && cd .. && \ - cd api && npm ci && npm run build:api + cd libs && npm ci --ignore-scripts && cd .. && \ + cd api && npm ci --ignore-scripts && npm run build:api # Deployment container diff --git a/docker-compose.yml b/docker-compose.yml index d0ed2783..5eaefb13 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ --- -version: '3.8' +version: "3.8" volumes: postgres-data: @@ -13,8 +13,8 @@ services: entrypoint: - sh - -c - - cd libs && npm ci && - cd ../admin && npm ci && + - cd libs && npm ci --ignore-scripts && + cd ../admin && npm ci --ignore-scripts && npm run start:admin healthcheck: test: ["CMD", "curl", "-f", "http://localhost:4200/admin"] @@ -58,7 +58,7 @@ services: retries: 3 start_period: 60s timeout: 5s - image: node:18 # need update to node 20 + image: node:18 # need update to node 20 ports: - 3333:3333 links: @@ -76,9 +76,9 @@ services: - sh - -c - grep -qxF 'CREATE EXTENSION IF NOT EXISTS pgcrypto'/docker-entrypoint-initdb.d/10_postgis.sh || - sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' - /docker-entrypoint-initdb.d/10_postgis.sh && - /usr/local/bin/docker-entrypoint.sh postgres + sed -i '/EXISTS postgis_tiger_geocoder;*/a CREATE EXTENSION IF NOT EXISTS pgcrypto;' + /docker-entrypoint-initdb.d/10_postgis.sh && + /usr/local/bin/docker-entrypoint.sh postgres environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=test diff --git a/public/Dockerfile b/public/Dockerfile index 242cac13..6e925aad 100644 --- a/public/Dockerfile +++ b/public/Dockerfile @@ -10,8 +10,8 @@ ARG build_dir WORKDIR /app COPY ./libs ./libs COPY ./${build_dir} ./${build_dir} -RUN cd libs && npm ci && cd .. && \ - cd ${build_dir} && npm ci && npm run build:${build_dir} && cd .. && \ +RUN cd libs && npm ci --ignore-scripts && cd .. && \ + cd ${build_dir} && npm ci --ignore-scripts && npm run build:${build_dir} && cd .. && \ rm -rf libs/node_modules ${build_dir}/node_modules