Selaa lähdekoodia

Fix Alpine 3.19 dependencies

DerLinkman 1 vuosi sitten
vanhempi
sitoutus
333b7ebc0c

+ 3 - 2
data/Dockerfiles/dockerapi/Dockerfile

@@ -10,12 +10,13 @@ RUN apk add --update --no-cache python3 \
   openssl \
   openssl \
   tzdata \
   tzdata \
   py3-psutil \
   py3-psutil \
+  py3-redis \
+  py3-async-timeout \
 && pip3 install --upgrade pip \
 && pip3 install --upgrade pip \
   fastapi \
   fastapi \
   uvicorn \
   uvicorn \
   aiodocker \
   aiodocker \
-  docker \
-  aioredis 
+  docker
 RUN mkdir /app/modules
 RUN mkdir /app/modules
 
 
 COPY docker-entrypoint.sh /app/
 COPY docker-entrypoint.sh /app/

+ 1 - 1
data/Dockerfiles/dockerapi/main.py

@@ -5,13 +5,13 @@ import json
 import uuid
 import uuid
 import async_timeout
 import async_timeout
 import asyncio
 import asyncio
-import aioredis
 import aiodocker
 import aiodocker
 import docker
 import docker
 import logging
 import logging
 from logging.config import dictConfig
 from logging.config import dictConfig
 from fastapi import FastAPI, Response, Request
 from fastapi import FastAPI, Response, Request
 from modules.DockerApi import DockerApi
 from modules.DockerApi import DockerApi
+from redis import asyncio as aioredis
 
 
 dockerapi = None
 dockerapi = None
 app = FastAPI()
 app = FastAPI()

+ 1 - 0
data/Dockerfiles/netfilter/Dockerfile

@@ -15,6 +15,7 @@ RUN apk add --virtual .build-deps \
   openssl-dev \
   openssl-dev \
 && apk add -U python3 \
 && apk add -U python3 \
   iptables \
   iptables \
+  iptables-dev \
   ip6tables \
   ip6tables \
   xtables-addons \
   xtables-addons \
   nftables \
   nftables \