Skip to content

Commit

Permalink
Merge pull request #7710 from ever-co/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
evereq authored Mar 28, 2024
2 parents 764b993 + 40ac469 commit e8cad84
Show file tree
Hide file tree
Showing 22 changed files with 2,293 additions and 3,789 deletions.
22 changes: 15 additions & 7 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ ARG OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
ARG REDIS_ENABLED
ARG REDIS_URL

FROM node:18-alpine3.17 AS dependencies
FROM node:18.19.1-alpine3.19 AS dependencies

LABEL maintainer="ever@ever.co"
LABEL org.opencontainers.image.source https://github.com/ever-co/ever-gauzy
Expand All @@ -118,9 +118,13 @@ ENV NODE_ENV=development
ENV PYTHON /usr/bin/python

RUN apk --update add bash && npm i -g npm \
&& apk add --no-cache --virtual build-dependencies curl jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \
&& apk add --no-cache --virtual build-dependencies curl tar xz jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \
snappy libheif dos2unix gcc g++ snappy-dev git libgcc libstdc++ linux-headers autoconf automake make nasm vips-dev vips

# Verify the Node.js version
RUN node --version
RUN npm --version

# Output Python3 version
RUN python3 --version

Expand Down Expand Up @@ -164,7 +168,7 @@ COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock
RUN yarn install --network-timeout 1000000 --frozen-lockfile
# RUN apk del build-dependencies make gcc g++ python2 py2-setuptools vips-dev

FROM node:18-alpine3.17 AS prodDependencies
FROM node:18.19.1-alpine3.19 AS prodDependencies

ENV CI=true

Expand All @@ -175,9 +179,13 @@ ARG NODE_ENV
ENV PYTHON /usr/bin/python

RUN apk --update add bash && npm i -g npm \
&& apk add --no-cache --virtual build-dependencies curl jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \
&& apk add --no-cache --virtual build-dependencies curl tar xz jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \
snappy libheif dos2unix gcc g++ snappy-dev git libgcc libstdc++ linux-headers autoconf automake make nasm vips-dev vips

# Verify the Node.js version
RUN node --version
RUN npm --version

# Output Python3 version
RUN python3 --version

Expand Down Expand Up @@ -218,7 +226,7 @@ RUN yarn install --network-timeout 1000000 --frozen-lockfile --production

RUN rm -r node_modules/@angular

FROM node:18-alpine3.17 AS development
FROM node:18.19.1-alpine3.19 AS development

USER node:node

Expand All @@ -228,7 +236,7 @@ COPY --chown=node:node --from=dependencies /wait /entrypoint.prod.sh /entrypoint
COPY --chown=node:node --from=dependencies /srv/gauzy .
COPY . .

FROM node:18-alpine3.17 AS build
FROM node:18.19.1-alpine3.19 AS build

WORKDIR /srv/gauzy

Expand Down Expand Up @@ -264,7 +272,7 @@ RUN if [ "$NODE_ENV" = "production" ]; then \

RUN yarn build:api:prod:docker

FROM node:18-alpine3.17 AS production
FROM node:18.19.1-alpine3.19 AS production

WORKDIR /srv/gauzy

Expand Down
12 changes: 8 additions & 4 deletions .deploy/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ ARG GAUZY_GITHUB_APP_ID
ARG JITSU_BROWSER_URL
ARG JITSU_BROWSER_WRITE_KEY

FROM node:18-alpine3.17 AS dependencies
FROM node:18.19.1-alpine3.19 AS dependencies

LABEL maintainer="ever@ever.co"
LABEL org.opencontainers.image.source https://github.com/ever-co/ever-gauzy

ENV CI=true

RUN apk --update add bash && \
apk add --no-cache --virtual build-dependencies curl jq python3 python3-dev py3-configobj py3-pip py3-setuptools dos2unix gcc g++ git make vips-dev && \
apk add --no-cache --virtual build-dependencies curl tar xz jq python3 python3-dev py3-configobj py3-pip py3-setuptools dos2unix gcc g++ git make vips-dev && \
mkdir /srv/gauzy && chown -R node:node /srv/gauzy

# Verify the Node.js version
RUN node --version
RUN npm --version

COPY wait .deploy/webapp/entrypoint.compose.sh .deploy/webapp/entrypoint.prod.sh /

RUN chmod +x /wait /entrypoint.compose.sh /entrypoint.prod.sh && dos2unix /entrypoint.compose.sh && dos2unix /entrypoint.prod.sh
Expand Down Expand Up @@ -79,7 +83,7 @@ COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock
RUN yarn install --network-timeout 1000000 --frozen-lockfile && yarn cache clean
# RUN apk del build-dependencies make gcc g++ python2 py2-setuptools vips-dev

FROM node:18-alpine3.17 AS development
FROM node:18.19.1-alpine3.19 AS development

USER node:node

Expand All @@ -89,7 +93,7 @@ COPY --chown=node:node --from=dependencies /wait /entrypoint.compose.sh /entrypo
COPY --chown=node:node --from=dependencies /srv/gauzy .
COPY . .

FROM node:18-alpine3.17 AS build
FROM node:18.19.1-alpine3.19 AS build

WORKDIR /srv/gauzy

Expand Down
2 changes: 1 addition & 1 deletion apps/desktop-timer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"rxjs": "^7.4.0",
"screenshot-desktop": "^1.12.7",
"sound-play": "1.1.0",
"sqlite3": "^5.1.5",
"sqlite3": "^5.1.7",
"squirrelly": "^8.0.8",
"twing": "^5.0.2",
"underscore": "^1.13.3"
Expand Down
Loading

0 comments on commit e8cad84

Please sign in to comment.