aletrn commited on
Commit
424ca6b
·
1 Parent(s): d649a23

ci: update Dockerfile because of removed fastapi poetry dependency group

Browse files
Files changed (2) hide show
  1. Dockerfile +1 -1
  2. dockerfiles/dockerfile-samgis-base +7 -19
Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- FROM registry.gitlab.com/aletrn/gis-prediction:1.6.10
2
 
3
  # Include global arg in this stage of the build
4
  ARG WORKDIR_ROOT="/var/task"
 
1
+ FROM registry.gitlab.com/aletrn/gis-prediction:1.7.0
2
 
3
  # Include global arg in this stage of the build
4
  ARG WORKDIR_ROOT="/var/task"
dockerfiles/dockerfile-samgis-base CHANGED
@@ -18,15 +18,12 @@ ARG POETRY_NO_INTERACTION
18
  ARG POETRY_VIRTUALENVS_IN_PROJECT
19
  ARG POETRY_VIRTUALENVS_CREATE
20
  ARG POETRY_CACHE_DIR
21
- ARG DEPENDENCY_GROUP
22
  ARG ZLIB1G="http://ftp.it.debian.org/debian/pool/main/z/zlib/zlib1g_1.3.dfsg-3+b1_amd64.deb"
23
 
24
  RUN echo "ARCH: $ARCH ..."
25
 
26
  RUN echo "ARG POETRY_CACHE_DIR: ${POETRY_CACHE_DIR} ..."
27
  RUN echo "ARG PYTHONPATH: $PYTHONPATH ..."
28
- RUN test -n ${DEPENDENCY_GROUP:?}
29
- RUN echo "python DEPENDENCY_GROUP: ${DEPENDENCY_GROUP} ..."
30
  RUN echo "arg dep:"
31
 
32
  # Set working directory to function root directory
@@ -49,7 +46,7 @@ RUN python -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
49
  RUN which poetry && poetry --version && poetry config --list
50
  RUN poetry config virtualenvs.path ${WORKDIR_ROOT}
51
  RUN echo "# poetry config --list #" && poetry config --list
52
- RUN poetry install --with ${DEPENDENCY_GROUP} --no-root --no-cache
53
 
54
 
55
  FROM python:3.11-slim-bookworm AS runtime
@@ -77,29 +74,23 @@ RUN ls -lA ${WORKDIR_ROOT}/
77
  ### conditional section
78
  FROM node:20-slim AS node_fastapi
79
 
80
- ARG DEPENDENCY_GROUP
81
  ENV PNPM_HOME="/pnpm"
82
  ENV PATH="$PNPM_HOME:$PATH"
83
  RUN corepack enable
84
 
85
  COPY ./static /appnode
86
  WORKDIR /appnode
87
- # RUN if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then echo "pnpm store path:" && pnpm store path; fi
88
 
89
 
90
  FROM node_fastapi AS node_prod_deps
91
 
92
- ARG DEPENDENCY_GROUP
93
- RUN --mount=type=cache,id=pnpm,target=/pnpm/store if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then \
94
- pnpm install --prod --frozen-lockfile; else \
95
- echo "DEPENDENCY_GROUP 1: ${DEPENDENCY_GROUP} ..."; fi
96
  # here multiple conditions concatenated to avoid failing on check
97
- RUN if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then if [ ! -d /appnode/node_modules ]; then echo "no node_modules folder" && exit 1; fi; fi
98
 
99
 
100
  FROM node_fastapi AS node_build
101
 
102
- ARG DEPENDENCY_GROUP
103
  ARG VITE__MAP_DESCRIPTION
104
  ARG VITE__SAMGIS_SPACE
105
  ENV VITE__INDEX_URL="/"
@@ -107,13 +98,10 @@ RUN echo "VITE__MAP_DESCRIPTION:" ${VITE__MAP_DESCRIPTION}
107
  RUN echo "VITE__SAMGIS_SPACE:" ${VITE__SAMGIS_SPACE}
108
  RUN echo "VITE__INDEX_URL:" ${VITE__INDEX_URL}
109
 
110
- RUN --mount=type=cache,id=pnpm,target=/pnpm/store if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then \
111
- pnpm install --frozen-lockfile; else \
112
- echo "DEPENDENCY_GROUP 2: ${DEPENDENCY_GROUP} ..."; fi
113
- RUN --mount=type=cache,id=pnpm,target=/pnpm/store if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then pnpm build; fi
114
- RUN --mount=type=cache,id=pnpm,target=/pnpm/store if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then \
115
- pnpm tailwindcss -i /appnode/src/input.css -o /appnode/dist/output.css; fi
116
- RUN if [ "${DEPENDENCY_GROUP}" = "fastapi" ]; then if [ ! -d /appnode/dist ]; then echo "no dist folder" && exit 1; fi; fi
117
 
118
 
119
  FROM runtime
 
18
  ARG POETRY_VIRTUALENVS_IN_PROJECT
19
  ARG POETRY_VIRTUALENVS_CREATE
20
  ARG POETRY_CACHE_DIR
 
21
  ARG ZLIB1G="http://ftp.it.debian.org/debian/pool/main/z/zlib/zlib1g_1.3.dfsg-3+b1_amd64.deb"
22
 
23
  RUN echo "ARCH: $ARCH ..."
24
 
25
  RUN echo "ARG POETRY_CACHE_DIR: ${POETRY_CACHE_DIR} ..."
26
  RUN echo "ARG PYTHONPATH: $PYTHONPATH ..."
 
 
27
  RUN echo "arg dep:"
28
 
29
  # Set working directory to function root directory
 
46
  RUN which poetry && poetry --version && poetry config --list
47
  RUN poetry config virtualenvs.path ${WORKDIR_ROOT}
48
  RUN echo "# poetry config --list #" && poetry config --list
49
+ RUN poetry install --no-root --no-cache
50
 
51
 
52
  FROM python:3.11-slim-bookworm AS runtime
 
74
  ### conditional section
75
  FROM node:20-slim AS node_fastapi
76
 
 
77
  ENV PNPM_HOME="/pnpm"
78
  ENV PATH="$PNPM_HOME:$PATH"
79
  RUN corepack enable
80
 
81
  COPY ./static /appnode
82
  WORKDIR /appnode
 
83
 
84
 
85
  FROM node_fastapi AS node_prod_deps
86
 
87
+ RUN --mount=type=cache,id=pnpm,target=/pnpm/store; pnpm install --prod --frozen-lockfile
 
 
 
88
  # here multiple conditions concatenated to avoid failing on check
89
+ RUN if [ ! -d /appnode/node_modules ]; then echo "no node_modules folder" && exit 1; fi
90
 
91
 
92
  FROM node_fastapi AS node_build
93
 
 
94
  ARG VITE__MAP_DESCRIPTION
95
  ARG VITE__SAMGIS_SPACE
96
  ENV VITE__INDEX_URL="/"
 
98
  RUN echo "VITE__SAMGIS_SPACE:" ${VITE__SAMGIS_SPACE}
99
  RUN echo "VITE__INDEX_URL:" ${VITE__INDEX_URL}
100
 
101
+ RUN --mount=type=cache,id=pnpm,target=/pnpm/store; pnpm install --frozen-lockfile
102
+ RUN --mount=type=cache,id=pnpm,target=/pnpm/store; pnpm build
103
+ RUN --mount=type=cache,id=pnpm,target=/pnpm/store; pnpm tailwindcss -i /appnode/src/input.css -o /appnode/dist/output.css
104
+ RUN if [ ! -d /appnode/dist ]; then echo "no dist folder" && exit 1; fi
 
 
 
105
 
106
 
107
  FROM runtime