File tree Expand file tree Collapse file tree 6 files changed +53
-39
lines changed Expand file tree Collapse file tree 6 files changed +53
-39
lines changed Original file line number Diff line number Diff line change @@ -156,15 +156,15 @@ jobs:
156
156
name : Run trivy scan
157
157
uses : numerique-gouv/action-trivy-cache@main
158
158
with :
159
- docker-build-args : ' -f src/frontend/Dockerfile --target y-provider'
159
+ docker-build-args : ' -f src/frontend/servers/y-provider/ Dockerfile --target y-provider'
160
160
docker-image-name : ' docker.io/lasuite/impress-frontend:${{ github.sha }}'
161
161
continue-on-error : true
162
162
-
163
163
name : Build and push
164
164
uses : docker/build-push-action@v6
165
165
with :
166
166
context : .
167
- file : ./src/frontend/Dockerfile
167
+ file : ./src/frontend/servers/y-provider/ Dockerfile
168
168
target : y-provider
169
169
build-args : DOCKER_USER=${{ env.DOCKER_USER }}:-1000
170
170
push : ${{ github.event_name != 'pull_request' }}
Original file line number Diff line number Diff line change @@ -14,6 +14,10 @@ and this project adheres to
14
14
- ✨(backend) add server-to-server API endpoint to create documents #467
15
15
- ✨(email) white brand email #412
16
16
17
+ ## Changed
18
+
19
+ - ⚡️(docker) improve y-provider image #422
20
+
17
21
18
22
## [ 1.9.0] - 2024-12-11
19
23
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ docker_build(
20
20
docker_build (
21
21
'localhost:5001/impress-y-provider:latest' ,
22
22
context = '..' ,
23
- dockerfile = '../src/frontend/Dockerfile' ,
23
+ dockerfile = '../src/frontend/servers/y-provider/ Dockerfile' ,
24
24
only = ['./src/frontend/' , './docker/' , './.dockerignore' ],
25
25
target = 'y-provider' ,
26
26
live_update = [
Original file line number Diff line number Diff line change @@ -159,17 +159,13 @@ services:
159
159
user : ${DOCKER_USER:-1000}
160
160
build :
161
161
context : .
162
- dockerfile : ./src/frontend/Dockerfile
162
+ dockerfile : ./src/frontend/servers/y-provider/ Dockerfile
163
163
target : y-provider
164
164
restart : unless-stopped
165
165
env_file :
166
166
- env.d/development/common
167
167
ports :
168
168
- " 4444:4444"
169
- volumes :
170
- - ./src/frontend/servers/y-provider:/home/frontend/servers/y-provider
171
- - /home/frontend/servers/y-provider/node_modules/
172
- - /home/frontend/servers/y-provider/dist/
173
169
174
170
kc_postgresql :
175
171
image : postgres:14.3
Original file line number Diff line number Diff line change 1
- FROM node:20-alpine AS frontend-deps-y-provider
2
-
3
- WORKDIR /home/frontend/
4
-
5
- COPY ./src/frontend/package.json ./package.json
6
- COPY ./src/frontend/yarn.lock ./yarn.lock
7
- COPY ./src/frontend/servers/y-provider/package.json ./servers/y-provider/package.json
8
- COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslint-config-impress/package.json
9
-
10
- RUN yarn install
11
-
12
- COPY ./src/frontend/ .
13
-
14
- # Copy entrypoint
15
- COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
16
-
17
- # ---- y-provider ----
18
- FROM frontend-deps-y-provider AS y-provider
19
-
20
- WORKDIR /home/frontend/servers/y-provider
21
- RUN yarn build
22
-
23
- # Un-privileged user running the application
24
- ARG DOCKER_USER
25
- USER ${DOCKER_USER}
26
-
27
- ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
28
-
29
- CMD ["yarn" , "start" ]
30
-
31
1
FROM node:20-alpine AS frontend-deps
32
2
33
3
WORKDIR /home/frontend/
@@ -40,7 +10,9 @@ COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslin
40
10
RUN yarn install --frozen-lockfile
41
11
42
12
COPY .dockerignore ./.dockerignore
43
- COPY ./src/frontend/ .
13
+ COPY ./src/frontend/.prettierrc.js ./.prettierrc.js
14
+ COPY ./src/frontend/packages/eslint-config-impress ./packages/eslint-config-impress
15
+ COPY ./src/frontend/apps/impress ./apps/impress
44
16
45
17
# ## ---- Front-end builder image ----
46
18
FROM frontend-deps AS impress
Original file line number Diff line number Diff line change
1
+ FROM node:20-alpine AS y-provider-builder
2
+
3
+ WORKDIR /home/frontend/
4
+
5
+ COPY ./src/frontend/package.json ./package.json
6
+ COPY ./src/frontend/yarn.lock ./yarn.lock
7
+ COPY ./src/frontend/servers/y-provider/package.json ./servers/y-provider/package.json
8
+ COPY ./src/frontend/packages/eslint-config-impress/package.json ./packages/eslint-config-impress/package.json
9
+
10
+ RUN yarn install
11
+
12
+ COPY ./src/frontend/packages/eslint-config-impress ./packages/eslint-config-impress
13
+ COPY ./src/frontend/servers/y-provider ./servers/y-provider
14
+
15
+ WORKDIR /home/frontend/servers/y-provider
16
+ RUN yarn build
17
+
18
+ FROM node:20-alpine AS y-provider
19
+
20
+ WORKDIR /home/frontend/
21
+
22
+ COPY ./src/frontend/package.json ./package.json
23
+ COPY ./src/frontend/yarn.lock ./yarn.lock
24
+ COPY ./src/frontend/servers/y-provider/package.json ./servers/y-provider/package.json
25
+
26
+ WORKDIR /home/frontend/servers/y-provider
27
+
28
+ COPY --from=y-provider-builder \
29
+ /home/frontend/servers/y-provider/dist \
30
+ ./dist
31
+
32
+ RUN NODE_ENV=production yarn install --frozen-lockfile
33
+
34
+ # Un-privileged user running the application
35
+ ARG DOCKER_USER
36
+ USER ${DOCKER_USER}
37
+
38
+ # Copy entrypoint
39
+ COPY ./docker/files/usr/local/bin/entrypoint /usr/local/bin/entrypoint
40
+ ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
41
+
42
+ CMD ["yarn" , "start" ]
You can’t perform that action at this time.
0 commit comments