From 071f6aff83d2274dcf6140445f6b51d2ddc03e91 Mon Sep 17 00:00:00 2001
From: Dominik Meyer <dmeyer@federationhq.de>
Date: Wed, 8 Jan 2025 08:38:36 +0100
Subject: [PATCH] fix: use full url to base image

---
 6.0/Containerfile    |   4 +-
 docker-entrypoint.sh | 166 -------------------------------------------
 2 files changed, 2 insertions(+), 168 deletions(-)
 delete mode 100644 docker-entrypoint.sh

diff --git a/6.0/Containerfile b/6.0/Containerfile
index 6ee50c2..1d59c1d 100644
--- a/6.0/Containerfile
+++ b/6.0/Containerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3-bookworm as builder
+FROM docker.io/ruby:3.3-bookworm as builder
 
 ARG REDMINE_TAG=6.0.2
 
@@ -91,7 +91,7 @@ RUN bundle config set --local without 'development test'
 RUN bundle config set --local path '/home/redmine/.local/share/gem'
 RUN bundle install 
 
-FROM ruby:3.3-bookworm
+FROM docker.io/ruby:3.3-bookworm
 
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install libyaml-0-2 tini ghostscript
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100644
index 91d9121..0000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/usr/bin/env bash
-set -Eeo pipefail
-# TODO add "-u"
-
-# usage: file_env VAR [DEFAULT]
-#    ie: file_env 'XYZ_DB_PASSWORD' 'example'
-# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
-#  "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
-file_env() {
-	local var="$1"
-	local fileVar="${var}_FILE"
-	local def="${2:-}"
-	if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
-		echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
-		exit 1
-	fi
-	local val="$def"
-	if [ "${!var:-}" ]; then
-		val="${!var}"
-	elif [ "${!fileVar:-}" ]; then
-		val="$(< "${!fileVar}")"
-	fi
-	export "$var"="$val"
-	unset "$fileVar"
-}
-
-isLikelyRedmine=
-case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
-esac
-
-_fix_permissions() {
-	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
-	if [ "$(id -u)" = '0' ]; then
-		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
-
-		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
-		local filesOwnerMode
-		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
-			dirs+=( files )
-		fi
-	fi
-	# directories 755, files 644:
-	args+=( ${args[@]:+,} '(' -type d '!' -perm 755 -exec sh -c 'chmod 755 "$@" 2>/dev/null || :' -- '{}' + ')' )
-	args+=( ${args[@]:+,} '(' -type f '!' -perm 644 -exec sh -c 'chmod 644 "$@" 2>/dev/null || :' -- '{}' + ')' )
-	find "${dirs[@]}" "${args[@]}"
-}
-
-# allow the container to be started with `--user`
-if [ -n "$isLikelyRedmine" ] && [ "$(id -u)" = '0' ]; then
-	_fix_permissions
-	exec gosu redmine "$BASH_SOURCE" "$@"
-fi
-
-if [ -n "$isLikelyRedmine" ]; then
-	_fix_permissions
-	if [ ! -f './config/database.yml' ]; then
-		file_env 'REDMINE_DB_MYSQL'
-		file_env 'REDMINE_DB_POSTGRES'
-		file_env 'REDMINE_DB_SQLSERVER'
-
-		if [ "$MYSQL_PORT_3306_TCP" ] && [ -z "$REDMINE_DB_MYSQL" ]; then
-			export REDMINE_DB_MYSQL='mysql'
-		elif [ "$POSTGRES_PORT_5432_TCP" ] && [ -z "$REDMINE_DB_POSTGRES" ]; then
-			export REDMINE_DB_POSTGRES='postgres'
-		fi
-
-		if [ "$REDMINE_DB_MYSQL" ]; then
-			adapter='mysql2'
-			host="$REDMINE_DB_MYSQL"
-			file_env 'REDMINE_DB_PORT' '3306'
-			file_env 'REDMINE_DB_USERNAME' "${MYSQL_ENV_MYSQL_USER:-root}"
-			file_env 'REDMINE_DB_PASSWORD' "${MYSQL_ENV_MYSQL_PASSWORD:-${MYSQL_ENV_MYSQL_ROOT_PASSWORD:-}}"
-			file_env 'REDMINE_DB_DATABASE' "${MYSQL_ENV_MYSQL_DATABASE:-${MYSQL_ENV_MYSQL_USER:-redmine}}"
-			file_env 'REDMINE_DB_ENCODING' ''
-		elif [ "$REDMINE_DB_POSTGRES" ]; then
-			adapter='postgresql'
-			host="$REDMINE_DB_POSTGRES"
-			file_env 'REDMINE_DB_PORT' '5432'
-			file_env 'REDMINE_DB_USERNAME' "${POSTGRES_ENV_POSTGRES_USER:-postgres}"
-			file_env 'REDMINE_DB_PASSWORD' "${POSTGRES_ENV_POSTGRES_PASSWORD}"
-			file_env 'REDMINE_DB_DATABASE' "${POSTGRES_ENV_POSTGRES_DB:-${REDMINE_DB_USERNAME:-}}"
-			file_env 'REDMINE_DB_ENCODING' 'utf8'
-		elif [ "$REDMINE_DB_SQLSERVER" ]; then
-			adapter='sqlserver'
-			host="$REDMINE_DB_SQLSERVER"
-			file_env 'REDMINE_DB_PORT' '1433'
-			file_env 'REDMINE_DB_USERNAME' ''
-			file_env 'REDMINE_DB_PASSWORD' ''
-			file_env 'REDMINE_DB_DATABASE' ''
-			file_env 'REDMINE_DB_ENCODING' ''
-		else
-			echo >&2
-			echo >&2 'warning: missing REDMINE_DB_MYSQL, REDMINE_DB_POSTGRES, or REDMINE_DB_SQLSERVER environment variables'
-			echo >&2
-			echo >&2 '*** Using sqlite3 as fallback. ***'
-			echo >&2
-
-			adapter='sqlite3'
-			host='localhost'
-			file_env 'REDMINE_DB_PORT' ''
-			file_env 'REDMINE_DB_USERNAME' 'redmine'
-			file_env 'REDMINE_DB_PASSWORD' ''
-			file_env 'REDMINE_DB_DATABASE' 'sqlite/redmine.db'
-			file_env 'REDMINE_DB_ENCODING' 'utf8'
-
-			mkdir -p "$(dirname "$REDMINE_DB_DATABASE")"
-			if [ "$(id -u)" = '0' ]; then
-				find "$(dirname "$REDMINE_DB_DATABASE")" \! -user redmine -exec chown redmine '{}' +
-			fi
-		fi
-
-		REDMINE_DB_ADAPTER="$adapter"
-		REDMINE_DB_HOST="$host"
-		echo "$RAILS_ENV:" > config/database.yml
-		for var in \
-			adapter \
-			host \
-			port \
-			username \
-			password \
-			database \
-			encoding \
-		; do
-			env="REDMINE_DB_${var^^}"
-			val="${!env}"
-			[ -n "$val" ] || continue
-			echo "  $var: \"$val\"" >> config/database.yml
-		done
-	fi
-
-	# install additional gems for Gemfile.local and plugins
-	bundle check || bundle install
-
-	if [ ! -s config/secrets.yml ]; then
-		file_env 'REDMINE_SECRET_KEY_BASE'
-		if [ -n "$REDMINE_SECRET_KEY_BASE" ]; then
-			cat > 'config/secrets.yml' <<-YML
-				$RAILS_ENV:
-				  secret_key_base: "$REDMINE_SECRET_KEY_BASE"
-			YML
-		elif [ ! -f config/initializers/secret_token.rb ]; then
-			rake generate_secret_token
-		fi
-	fi
-	if [ "$1" != 'rake' -a -z "$REDMINE_NO_DB_MIGRATE" ]; then
-		rake db:migrate
-	fi
-
-	if [ "$1" != 'rake' -a -n "$REDMINE_PLUGINS_MIGRATE" ]; then
-		rake redmine:plugins:migrate
-		rake redmine:plugins:assets RAILS_ENV=production
-	fi
-
-	# remove PID file to enable restarting the container
-	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
-fi
-
-exec "$@"