bitnami override

Author: ChandonPierre

Dockerfile

@@ -146,8 +146,13 @@ ENV PROXY_CONNECT_READ_TIMEOUT="60s"
 ENV PROXY_CONNECT_CONNECT_TIMEOUT="60s"
 ENV PROXY_CONNECT_SEND_TIMEOUT="60s"
 
-# Allow disabling IPV6 resolution, default to false
-ENV DISABLE_IPV6="false"
+# Allow disabling IPV6 resolution, default to true
+ENV DISABLE_IPV6="true"
+
+# Bitnami dockerhub overrides
+ENV BITNAMI_DOCKERHUB_HOST_OVERRIDE="false"
+ENV BITNAMI_HOST=""
+ENV BITNAMI_LEGACY_DOCKERHUB_URI_REWRITE="false"
 
 # Did you want a shell? Sorry, the entrypoint never returns, because it runs nginx itself. Use 'docker exec' if you need to mess around internally.
 ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -50,7 +50,7 @@ ALLDOMAINS=""
 echo -n "" > /etc/nginx/docker.intercept.map
 
 # Some hosts/registries are always needed, but others can be configured in env var REGISTRIES
-for ONEREGISTRYIN in docker.caching.proxy.internal registry-1.docker.io auth.docker.io ${REGISTRIES}; do
+for ONEREGISTRYIN in docker.caching.proxy.internal index.docker.io registry-1.docker.io auth.docker.io ${REGISTRIES}; do
     ONEREGISTRY=$(echo ${ONEREGISTRYIN} | xargs) # Remove whitespace
     echo "Adding certificate for registry: $ONEREGISTRY"
     ALLDOMAINS="${ALLDOMAINS},DNS:${ONEREGISTRY}"
@@ -399,6 +399,37 @@ fi
 # Set worker processes if provided
 sed -i "s/worker_processes  auto;/worker_processes  ${WORKER_PROCESSES};/g" /etc/nginx/nginx.conf
 
+echo "" > /etc/nginx/nginx.manifest.override.conf
+if [[ "a${BITNAMI_DOCKERHUB_HOST_OVERRIDE}" == "atrue" && ${BITNAMI_HOST} != "" ]]; then
+    cat << EOD >> /etc/nginx/nginx.manifest.override.conf
+    set \$overrideHost 0;
+    if (\$request_uri ~ ^/v2/bitnami/) {
+        set \$overrideHost 1;
+    }
+    if (\$host !~* (^|\.)docker\.io$) {
+        set \$overrideHost 0;
+    }
+    if (\$overrideHost) {
+        set \$targetHost "${BITNAMI_HOST}";
+    }
+EOD
+fi
+
+if [[ "a${BITNAMI_LEGACY_DOCKERHUB_URI_REWRITE}" == "atrue" ]]; then
+    cat << EOD >> /etc/nginx/nginx.manifest.override.conf
+    set \$doRewrite 0;
+    if (\$request_uri ~ ^/v2/bitnami/) {
+        set \$doRewrite 1;
+    }
+    if (\$host !~* (^|\.)docker\.io$) {
+        set \$doRewrite 0;
+    }
+    if (\$doRewrite) {
+        rewrite ^/v2/bitnami/(.*)$ /v2/bitnamilegacy\$1 break;
+    }
+EOD
+fi
+
 echo -e "\nFinal resolver configuration: ---"
 cat "${confpath}"
 echo -e "---\n"

nginx.manifest.common.conf

@@ -1,4 +1,5 @@
     # nginx config fragment included in every manifest-related location{} block.
+    include "/etc/nginx/nginx.manifest.override.conf";
     add_header X-Docker-Registry-Proxy-Cache-Upstream-Status "$upstream_cache_status";
     add_header X-Docker-Registry-Proxy-Cache-Type "$docker_proxy_request_type";
     proxy_pass https://$targetHost;