[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
This commit is contained in:
Sheldan
2023-12-20 21:07:59 +01:00
parent 4128274a7d
commit 58d6b12a67
7 changed files with 12 additions and 50 deletions

View File

@@ -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>

View File

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

View File

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

View File

@@ -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