From 0ff75a97c8d6e24f5802f31f36b01b5e37d177c7 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Wed, 2 Oct 2024 09:41:48 -0700
Subject: [PATCH] fix(openchallenges): update the Thumbor image to support AWS
 managed policies (ARCH-302) (#2870)

---
 apps/openchallenges/thumbor/Dockerfile        |  4 +-
 .../thumbor/docker-entrypoint.sh              | 58 -------------------
 2 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 apps/openchallenges/thumbor/docker-entrypoint.sh

diff --git a/apps/openchallenges/thumbor/Dockerfile b/apps/openchallenges/thumbor/Dockerfile
index 1d71313c56..203b0c1e79 100644
--- a/apps/openchallenges/thumbor/Dockerfile
+++ b/apps/openchallenges/thumbor/Dockerfile
@@ -1,3 +1 @@
-FROM beeyev/thumbor-s3:7.7-alpine
-
-COPY --chmod=0755 ./docker-entrypoint.sh /docker-entrypoint.sh
\ No newline at end of file
+FROM beeyev/thumbor-s3:7.7-debian
\ No newline at end of file
diff --git a/apps/openchallenges/thumbor/docker-entrypoint.sh b/apps/openchallenges/thumbor/docker-entrypoint.sh
deleted file mode 100644
index d0a00184c7..0000000000
--- a/apps/openchallenges/thumbor/docker-entrypoint.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Alexander Tebiev - https://github.com/beeyev
-
-#String Colors
-NC='\033[0;m'      # Default Color
-GRN='\033[32;1m'
-RED='\033[31;1m'
-BLK='\033[30;1m'
-GRY='\033[90;1m'
-
-# Set the number of cpu cores
-export NUM_CPUS=`nproc`
-
-if [ ! -f /app/thumbor.conf ]; then
-  envtpl /usr/local/etc/thumbor.conf.tpl  --allow-missing --keep-template
-  sed -i "s/'None'/None/g" /usr/local/etc/thumbor.conf
-else
-  sed -i "s/'None'/None/g" /app/thumbor.conf
-fi
-
-# If log level is defined we configure it, else use default log_level = info
-if [[ -n "${LOG_LEVEL}" ]]
-then
-    LOG_PARAMETER="--log-level=${LOG_LEVEL}"
-fi
-
-# Check if thumbor port is defined -> (default port 8888)
-if [[ -n "${PORT}" ]]
-then
-    PORT_PARAMETER="--port=${PORT}"
-fi
-
-# Set number of processes
-if [[ -n "${NUM_PROCESSES}" ]]
-then
-    NUM_PROCESSES_PARAMETER="--processes=${NUM_PROCESSES}"
-fi
-
-# Run custom script before the main docker process gets started
-for f in /docker-entrypoint.init.d/*; do
-    case "$f" in
-        *.sh) # this should match the set of files we check for below
-            echo "⚙	 Executing entrypoint.init file: ${f}"
-            . $f
-            break
-            ;;
-    esac
-done
-
-THUMBOR_EXEC="thumbor ${PORT_PARAMETER} --conf=/usr/local/etc/thumbor.conf ${LOG_PARAMETER} ${NUM_PROCESSES_PARAMETER}"
-
-printf "\n\n${GRN}--->${NC} $($(which thumbor) --version)"
-printf "\n${GRN}--->${NC} Starting Thumbor on port: ${GRN}${PORT}${NC}, log level: ${GRN}${LOG_LEVEL}${NC}, CPU cores available: ${GRN}${NUM_CPUS}${NC}"
-printf "\n${GRN}--->${NC} Exec command: ${GRY}${THUMBOR_EXEC}${NC}"
-printf "\n${GRN}--->${NC} Docker image build date: ${GRY}${BUILD_DATE}${NC}, fingerprint: ${GRY}${BUILD_FINGERPRINT}${NC}"
-printf "\n${GRN}--->${NC} Docker image project url: ${GRY}https://github.com/beeyev/thumbor-s3-docker${NC}\n\n"
-exec ${THUMBOR_EXEC}
-