bump to alpine 3.17, tweaking, fixes for py 3.10

This commit is contained in:
t3chn0m4g3 2023-01-23 15:42:59 +00:00
parent 8119aca317
commit 390390fd43
8 changed files with 13 additions and 12 deletions

View file

@ -1,6 +1,6 @@
# In case of problems Alpine 3.13 needs to be used: # In case of problems Alpine 3.13 needs to be used:
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
FROM alpine:3.16 FROM alpine:3.17
# #
# Add source # Add source
COPY . /opt/p0f COPY . /opt/p0f

View file

@ -1,4 +1,4 @@
FROM alpine:3.16 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.16 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -70,7 +70,7 @@ RUN apk -U --no-cache add \
# Clean up # Clean up
apk del --purge build-base \ apk del --purge build-base \
gcc \ gcc \
git \ git \
libffi-dev \ libffi-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt-dev \

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/

View file

@ -1,2 +1,2 @@
aiohttp_jinja2==1.1.0 aiohttp_jinja2==1.5.0
cssutils==1.0.2 cssutils==1.0.2

View file

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/
@ -31,12 +31,13 @@ RUN apk -U --no-cache add \
python3-dev && \ python3-dev && \
# #
# Setup Tanner # Setup Tanner
git clone https://github.com/mushorg/tanner /opt/tanner && \ # git clone https://github.com/mushorg/tanner /opt/tanner && \
git clone https://github.com/t3chn0m4g3/tanner /opt/tanner && \
cd /opt/tanner/ && \ cd /opt/tanner/ && \
# git fetch origin pull/364/head:test && \ # git fetch origin pull/364/head:test && \
# git checkout test && \ # git checkout test && \
# git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \ # git checkout 20dabcbccc50f8878525677b925a4c9abcaf9f54 && \
git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \ # git checkout 2fdce2e2ad7e125012c7e6dcbfa02b50f73c128e && \
# sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \ # sed -i 's/aioredis/aioredis==1.3.1/g' requirements.txt && \
# sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \ # sed -i 's/^aiohttp$/aiohttp==3.7.4/g' requirements.txt && \
cp /root/dist/config.yaml /opt/tanner/tanner/data && \ cp /root/dist/config.yaml /opt/tanner/tanner/data && \
@ -68,7 +69,7 @@ RUN apk -U --no-cache add \
git \ git \
libcap \ libcap \
libffi-dev \ libffi-dev \
libressl-dev \ # libressl-dev \
linux-headers \ linux-headers \
python3-dev && \ python3-dev && \
rm -rf /root/* && \ rm -rf /root/* && \

View file

@ -1,4 +1,4 @@
FROM alpine:3.16 FROM alpine:3.17
# #
# Include dist # Include dist
COPY dist/ /root/dist/ COPY dist/ /root/dist/