Merge branch 'benbusby:main' into main

This commit is contained in:
hryxl 2022-02-25 17:35:45 +03:00 committed by GitHub
commit 2f7167453e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,4 +1,4 @@
FROM python:3.8-alpine as builder
FROM python:3.11.0a5-alpine as builder
RUN apk --update add \
build-base \
@ -12,7 +12,7 @@ COPY requirements.txt .
RUN pip install --upgrade pip
RUN pip install --prefix /install --no-warn-script-location --no-cache-dir -r requirements.txt
FROM python:3.8-alpine
FROM python:3.11.0a5-alpine
RUN apk add --update --no-cache tor curl openrc
# libcurl4-openssl-dev
@ -22,7 +22,8 @@ RUN apk -U upgrade
ARG DOCKER_USER=whoogle
ARG DOCKER_USERID=927
ARG config_dir=/config
RUN mkdir -p -m 777 $config_dir
RUN mkdir -p $config_dir
RUN chmod a+w $config_dir
VOLUME $config_dir
ARG username=''
@ -75,7 +76,7 @@ COPY run .
RUN adduser -D -g $DOCKER_USERID -u $DOCKER_USERID $DOCKER_USER
# Fix ownership / permissions
RUN chown -R ${DOCKER_USER}:${DOCKER_USER} /whoogle /var/lib/tor
RUN chown -R ${DOCKER_USER}:${DOCKER_USER} /whoogle /var/lib/tor
# Allow writing symlinks to build dir
RUN chown $DOCKER_USERID:$DOCKER_USERID app/static/build