From e72d8437f75f7f11457b3605181a7d346900b337 Mon Sep 17 00:00:00 2001
From: Ben Busby <contact@benbusby.com>
Date: Mon, 21 Feb 2022 09:33:30 -0700
Subject: [PATCH 1/2] [Docker] Split config dir creation/set permissions

If the config dir already exists, setting the mode (`-m 777`) doesn't
actually work as it should. This change splits the command into two
separate commands for directory creation and enabling the directory to
be writable by all.

Fixes #658
---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b6f6483..dac0098 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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

From c3634a513528eb33e9caa6a2742d6024d399791c Mon Sep 17 00:00:00 2001
From: Albony Cal <67057319+Albonycal@users.noreply.github.com>
Date: Wed, 23 Feb 2022 22:03:46 +0530
Subject: [PATCH 2/2] Upgrade Python image in Dockerfile (#669)

Vulnerable Python image upgraded to python:3.11.0a5-alpine
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dac0098..90001db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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