[SIS-xxx] refactoring to use a base image for rest api instead of a zipfile

changing image pull policy for rest api and bot to always
renaming rest api container

Tiltfile

@@ -2,6 +2,7 @@ allow_k8s_contexts('k8s-cluster')
 
 load('ext://restart_process', 'docker_build_with_restart')
 registry = 'harbor.sheldan.dev/sissi/'
+abstracto_registry = 'harbor.sheldan.dev/abstracto/'
 
 local_resource(
   'sissi-java-compile',
@@ -28,7 +29,7 @@ docker_build_with_restart(
 )
 
 docker_build(registry + 'sissi-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
-docker_build(registry + 'sissi-rest-api', 'deployment/image-packaging/src/main/docker/rest-api/')
+docker_build(registry + 'sissi-rest-api', 'deployment/image-packaging/src/main/docker/rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
 docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
 
 

deployment/helm/sissi/templates/rest-api-deployment.yaml

@@ -25,7 +25,7 @@ spec:
       securityContext:
         {{- toYaml .Values.restApi.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
+        - name: {{ .Chart.Name }}-rest-api
           securityContext:
             {{- toYaml .Values.restApi.securityContext | nindent 12 }}
           image: "{{ .Values.restApi.repository }}/{{ .Values.restApi.image }}:{{ .Values.restApi.tag | default .Chart.AppVersion }}"

deployment/helm/sissi/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 bot:
   repository: harbor.sheldan.dev/sissi
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   image: sissi-bot
   tag: 1.4.29
   livenessProbe:
@@ -23,7 +23,7 @@ bot:
 restApi:
   enabled: true
   repository: harbor.sheldan.dev/sissi
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   image: sissi-rest-api
   tag: 1.4.29
   podAnnotations: {}

deployment/image-packaging/pom.xml

@@ -826,25 +826,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>dev.sheldan.sissi.api</groupId>
-                                    <artifactId>rest-api</artifactId>
-                                    <version>${abstracto.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${file.basedir}/rest-api/python</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
                 </executions>
          
             </plugin>

deployment/image-packaging/src/main/docker/.env

@@ -1,2 +1,3 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/sissi/
-VERSION=1.4.29
+VERSION=1.4.29
+ABSTRACTO_VERSION=1.5.15

deployment/image-packaging/src/main/docker/rest-api/Dockerfile

@@ -1,9 +1,5 @@
-FROM python:3.10.13-alpine3.18
+ARG REGISTRY_PREFIX
-ADD requirements.txt /
+
-RUN pip install -r requirements.txt
+FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest}
-RUN apk --no-cache add msttcorefonts-installer fontconfig && \
+ADD python/resources /python/resources
-    update-ms-fonts && \
+ADD python/custom /python/custom
-    fc-cache -f
-ADD wrapper /
-ADD python /python
-CMD ["/run.sh"]

deployment/image-packaging/src/main/docker/rest-api/requirements.txt

@@ -1,17 +0,0 @@
-blinker==1.7.0
-certifi==2023.7.22
-charset-normalizer==3.3.2
-click==8.1.7
-Flask==3.0.0
-idna==3.4
-importlib-metadata==6.8.0
-itsdangerous==2.1.2
-Jinja2==3.1.2
-MarkupSafe==2.1.3
-Pillow==10.1.0
-requests==2.31.0
-urllib3==2.0.7
-waitress==2.1.2
-Werkzeug==3.0.1
-zipp==3.17.0
-pytz==2023.3.post1