From f542f9facb04dbf276af21999ca9958ee189d11a Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Thu, 10 Oct 2024 00:14:38 -0300
Subject: [PATCH 01/27] In progress

---
 docker/ckan/files/cert/localhost.cert         |  22 ++
 docker/ckan/files/cert/localhost.key          |  27 ++
 docker/ckan/files/ckan.ini                    | 299 ++++++++++++++++++
 docker/ckan/files/etc/ckan-worker.conf        |  13 +
 docker/ckan/files/patches/.keep               |   0
 docker/ckan/files/requirements.txt            |   0
 docker/ckan/files/scripts/entrypoint.sh       |  89 ++++++
 docker/ckan/files/scripts/install-ckan.sh     |  45 +++
 .../scripts/prepare-local-dev-extensions.sh   |  78 +++++
 docker/ckan/files/vars/base.env               |   3 +
 docker/ckan/files/vars/dev.env                |   1 +
 11 files changed, 577 insertions(+)
 create mode 100644 docker/ckan/files/cert/localhost.cert
 create mode 100644 docker/ckan/files/cert/localhost.key
 create mode 100644 docker/ckan/files/ckan.ini
 create mode 100644 docker/ckan/files/etc/ckan-worker.conf
 create mode 100644 docker/ckan/files/patches/.keep
 create mode 100644 docker/ckan/files/requirements.txt
 create mode 100755 docker/ckan/files/scripts/entrypoint.sh
 create mode 100755 docker/ckan/files/scripts/install-ckan.sh
 create mode 100755 docker/ckan/files/scripts/prepare-local-dev-extensions.sh
 create mode 100644 docker/ckan/files/vars/base.env
 create mode 100644 docker/ckan/files/vars/dev.env

diff --git a/docker/ckan/files/cert/localhost.cert b/docker/ckan/files/cert/localhost.cert
new file mode 100644
index 0000000..eb24fc0
--- /dev/null
+++ b/docker/ckan/files/cert/localhost.cert
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIUG7oo+0zZ1ynU0q1NMJdhstUy9hgwDQYJKoZIhvcNAQEL
+BQAwazELMAkGA1UEBhMCQVIxEDAOBgNVBAgMB0NvcmRvYmExEzARBgNVBAcMCk1l
+bmRpb2xhemExDTALBgNVBAoMBE9LRk4xJjAkBgkqhkiG9w0BCQEWF2FuZHJlcy52
+YXpxdWV6QG9rZm4ub3JnMB4XDTI0MDIyMTEzMjY0MloXDTM0MDIxODEzMjY0Mlow
+azELMAkGA1UEBhMCQVIxEDAOBgNVBAgMB0NvcmRvYmExEzARBgNVBAcMCk1lbmRp
+b2xhemExDTALBgNVBAoMBE9LRk4xJjAkBgkqhkiG9w0BCQEWF2FuZHJlcy52YXpx
+dWV6QG9rZm4ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvs7I
+/XU0xFKyVufvh+TI6ndNHwwkMH+cJG9TKtHPIlab69aMy7QAbDVZwjCeyUxEpR1v
+6AOi0ROFANckSTyZkov6VfphifX75Zu9CjFlx4Nxx0QO43ejvPeENhk/A7V/dubD
+OIT3/zdZ5KprgLfE0Ue7ozKQsZlDNWEDOn5tEF7y8R/yxIqjKSOzMD1jnE6uymLy
+mSdcUvlt+N/NVz4/brH5C82CBzx6J4dD+BcL8T6s1BwqbakKpDsT9wGZBCF2m1t5
+oxrKtCvBORjHIKmveoRC899JlSFFtF7Qgh7eqW7UbPy75ifkP4fE/vmNr970hi/F
+Vg438BSXFDIBNu6kFwIDAQABo1MwUTAdBgNVHQ4EFgQU2ddEVsad4Ct7fisvUByt
+BRkHjTEwHwYDVR0jBBgwFoAU2ddEVsad4Ct7fisvUBytBRkHjTEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAkB2a8QH4ILUqTfwCWeurv51BOMfm
+TZQQIvFkwx9cFKJO6dTn9BjFSnnZZUvHWx5hvooA6FKZZf4RlAApz1NwGrxDjd2Q
+97HnJK1YQ77T1zyKoiNGurateCn7bz0I0M9pZOsdlmdG0HcNiHalF3kx5I3tPJk3
+GPmxi7fF9dE+Mp+zYrIAeiq5QZVYJNTal2bPWWcU9lbOR8Thk+oDwxLeUY9XRfrp
+vqdUqPi4waFezqEY2LQCPONTGzhDp3oBgjkB7/YCwSw/gyT7NWlqd/a86HnuWicE
+l+Nyj58dMyq5DgpDnCZa7R10SGQNxwVUKrolBqU6aRbRApWjR8SmUWGQVQ==
+-----END CERTIFICATE-----
diff --git a/docker/ckan/files/cert/localhost.key b/docker/ckan/files/cert/localhost.key
new file mode 100644
index 0000000..92d4c3d
--- /dev/null
+++ b/docker/ckan/files/cert/localhost.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAvs7I/XU0xFKyVufvh+TI6ndNHwwkMH+cJG9TKtHPIlab69aM
+y7QAbDVZwjCeyUxEpR1v6AOi0ROFANckSTyZkov6VfphifX75Zu9CjFlx4Nxx0QO
+43ejvPeENhk/A7V/dubDOIT3/zdZ5KprgLfE0Ue7ozKQsZlDNWEDOn5tEF7y8R/y
+xIqjKSOzMD1jnE6uymLymSdcUvlt+N/NVz4/brH5C82CBzx6J4dD+BcL8T6s1Bwq
+bakKpDsT9wGZBCF2m1t5oxrKtCvBORjHIKmveoRC899JlSFFtF7Qgh7eqW7UbPy7
+5ifkP4fE/vmNr970hi/FVg438BSXFDIBNu6kFwIDAQABAoIBAB7+zFuP7JBvtpSz
+fI+gtJqR4q9Gc6KFOEIa63GrP3CejRmUcq6sgN0TFY+cAk9E2mnQDFuuK4a3GwX1
+7OkQtQm/P100HSAiG1dDI0RCnfv4+EScY6bDyo9pzcpT846QrzILbm8B+p80yJ+C
+p4/zSj+M3Yg3MJYJBYfoSHP6EZF080RrE3US2LMNeh1fnjVnTdOURWe8IWgUde5n
+E8zqxyaKJ66KvmIGEqtPlN/jvr/73Itnz65l/WAN4ENlnHxbYpXwY6sJCvh/ncmy
+uihoKNNViHya0fGel1BNJxtZ2ZiW5DufUazdu5l0HWPVhTnth9nUWlG1lp88ihyZ
+S6MkP4ECgYEA4WJIsGeBOgbAUW1WphjQOielanVH1qeSDkvGRp2qJHdQI2T8suuV
+6rTlbQcd6gjdGC7F44oEWNuy84q1uoVAAsHG0WXDzI4qKy4qOceKGOoVB8jWmIvV
+SHQlt8PoCiXam+YnZe0vWpOKJYenEeAOmNi9ZuPJYgQ74zfQvvhbM/cCgYEA2Lod
+0J6UmQmdsNqqcQVbdliHvW1e5L6k7sfdBSl6OsW39tG0XRvVAG74mGKBmwNMdH04
+AAr90Qr3aBlvUQ3ps6+SaAA+j7CAHMSnwy9rQdYQloq1PJeXeR4Qzw1aQIVMci2V
+SugauIi+yv3dcosFvzKco6alA5cHwN3ik137yOECgYEA3EpsMb95F3Yx02TDJGVs
+YOsPSxaGuM/gegimK68+9ZWIxo+WTmrlhRp6hC5Ils9DCrfsw5HK3e8e4dvZ9Az5
+m7g608BbuDvcC4h7zS2zVNa253zuAvvp439ivlLFIeYN3gL+zykc97Lte/Ey4s3U
+dqChv0c1NpBc2KFdbsrgmdECgYB7GCKtBhTyYxLMizX5YYiUTC40ufUGyP1Wne/7
+6ZYB4aDeMDdYFuHBEEZkDrb8O0BmfWScKaIF5EunNaMTD2roYtUt+s2NwTrSnCOI
+6drqltHvHzNXCea/pQL5BuV29f74bsl3tSLQIuLy2oO3dhy6ft2W2aSpyFNgCOaS
+uvOyIQKBgDX71ooeSNXhbSscnWwa0sUetZvkB0Zz2ebje1IXOOfU5T9EI6p7arx4
+NAInkeup/oqgkoR+L5bzqdm6sh8GQ+WQnIX3NfPYS2u4rsDV+mle624DRzf7Z0kV
+GnT4XNGjFzZ1yahUzF3k6baHK9O5QJAABu9MhMb3JRDHHqMYt1le
+-----END RSA PRIVATE KEY-----
diff --git a/docker/ckan/files/ckan.ini b/docker/ckan/files/ckan.ini
new file mode 100644
index 0000000..6a44270
--- /dev/null
+++ b/docker/ckan/files/ckan.ini
@@ -0,0 +1,299 @@
+#
+# CKAN configuration
+#
+# http://docs.ckan.org/en/latest/maintaining/configuration.html
+#
+# The %(here)s variable will be replaced with the parent directory of this file
+#
+[DEFAULT]
+
+## Default settings ############################################################
+debug = false
+
+[app:main]
+
+## General settings ############################################################
+use = egg:ckan
+SECRET_KEY = <this-will-be-replaced-with-secret>
+ckan.legacy_route_mappings = {}
+config.mode = strict
+
+## Development settings ########################################################
+ckan.devserver.host = localhost
+ckan.devserver.port = 5000
+ckan.devserver.threaded = false
+ckan.devserver.multiprocess = 1
+ckan.devserver.watch_patterns =
+ckan.devserver.ssl_cert =
+ckan.devserver.ssl_key =
+
+## Session settings ############################################################
+ckan.user.last_active_interval = 600
+cache_dir = /tmp/%(ckan.site_id)s
+beaker.session.key = ckan
+beaker.session.secret = string:%(SECRET_KEY)s
+beaker.session.auto = false
+beaker.session.cookie_expires = false
+# beaker.session.cookie_domain = .example.com
+beaker.session.save_accessed_time = true
+beaker.session.secure = false
+beaker.session.timeout = 1200
+beaker.session.type = cookie
+beaker.session.validate_key = <this-will-be-replaced-with-secret>
+beaker.session.httponly = true
+beaker.session.samesite = Lax
+
+## Database settings ###########################################################
+sqlalchemy.url = <this-will-be-replaced-with-secret>
+sqlalchemy.pool_pre_ping = true
+# sqlalchemy.<OPTION> =
+
+## Site Settings ###############################################################
+ckan.site_url = <this-will-be-replaced-with-secret>
+apitoken_header_name = Authorization
+ckan.cache_expires = 0
+ckan.cache_enabled = false
+ckan.mimetype_guess = file_ext
+ckan.static_max_age = 3600
+ckan.valid_url_schemes = http https ftp
+ckan.requests.timeout = 5
+ckan.hide_version = false
+
+## Authorization Settings ######################################################
+ckan.auth.anon_create_dataset = false
+ckan.auth.create_unowned_dataset = false
+# Do not allow user to create datasets if not in an organization
+ckan.auth.create_dataset_if_not_in_organization = false
+ckan.auth.user_create_groups = true
+# Do not allow regular users to create organizations
+ckan.auth.user_create_organizations = false
+ckan.auth.user_delete_groups = true
+ckan.auth.user_delete_organizations = true
+ckan.auth.create_user_via_api = false
+ckan.auth.create_user_via_web = false
+ckan.auth.roles_that_cascade_to_sub_groups = admin
+ckan.auth.public_user_details = true
+ckan.auth.public_activity_stream_detail = false
+ckan.auth.allow_dataset_collaborators = false
+ckan.auth.allow_admin_collaborators = false
+ckan.auth.allow_collaborators_to_change_owner_org = false
+ckan.auth.create_default_api_keys = false
+ckan.auth.login_view = user.login
+ckan.auth.reveal_private_datasets = false
+ckan.auth.enable_cookie_auth_in_api = true
+ckan.auth.route_after_login = dashboard.datasets
+
+## CSRF Protection #############################################################
+WTF_CSRF_ENABLED = true
+WTF_CSRF_CHECK_DEFAULT = true
+WTF_CSRF_SECRET_KEY = string:%(SECRET_KEY)s
+WTF_CSRF_METHODS = POST PUT PATCH DELETE
+WTF_CSRF_FIELD_NAME = _csrf_token
+WTF_CSRF_HEADERS = X-CSRFToken X-CSRF-Token
+WTF_CSRF_TIME_LIMIT = 3600
+WTF_CSRF_SSL_STRICT = true
+WTF_I18N_ENABLED = true
+ckan.csrf_protection.ignore_extensions = false
+
+## Flask-Login Remember me cookie settings #####################################
+REMEMBER_COOKIE_NAME = remember_token
+REMEMBER_COOKIE_DURATION = 31536000
+# REMEMBER_COOKIE_DOMAIN = .example.com
+REMEMBER_COOKIE_PATH = /
+REMEMBER_COOKIE_SECURE = false
+REMEMBER_COOKIE_HTTPONLY = true
+REMEMBER_COOKIE_REFRESH_EACH_REQUEST = false
+REMEMBER_COOKIE_SAMESITE = None
+
+## API Token Settings ##########################################################
+api_token.nbytes = 32
+api_token.jwt.encode.secret = string:%(SECRET_KEY)s
+api_token.jwt.decode.secret = string:%(SECRET_KEY)s
+api_token.jwt.algorithm = HS256
+
+## Search Settings #############################################################
+ckan.site_id = default
+solr_url = <this-will-be-replaced-with-secret>
+solr_user =
+solr_password =
+ckan.search.remove_deleted_packages = true
+ckan.search.solr_commit = true
+ckan.search.show_all_types = dataset
+ckan.search.default_include_private = true
+ckan.search.default_package_sort = score desc, metadata_modified desc
+search.facets = organization groups res_format
+search.facets.limit = 50
+search.facets.default = 10
+ckan.extra_resource_fields =
+ckan.search.rows_max = 1000
+ckan.group_and_organization_list_max = 1000
+ckan.group_and_organization_list_all_fields_max = 25
+solr_timeout = 60
+
+## Redis Settings ##############################################################
+ckan.redis.url = <this-will-be-replaced-with-secret>
+
+## CORS Settings ###############################################################
+ckan.cors.origin_allow_all = false
+ckan.cors.origin_whitelist =
+
+## Plugins Settings ############################################################
+ckan.plugins = stats activity datastore datatables_view resource_proxy pdf_view geo_view
+ckan.resource_proxy.timeout = 5
+
+## Front-End Settings ##########################################################
+ckan.site_title = CKAN
+ckan.site_description =
+ckan.site_intro_text =
+ckan.site_logo = /base/images/logo-left-aligned-positive.png
+ckan.site_about =
+ckan.theme = css/main
+ckan.datasets_per_page = 20
+package_hide_extras =
+ckan.recaptcha.publickey =
+ckan.recaptcha.privatekey =
+ckan.featured_groups =
+ckan.featured_orgs =
+ckan.default_group_sort = title
+ckan.gravatar_default = identicon
+ckan.debug_supress_header = false
+ckan.site_custom_css =
+
+## Resource Views Settings #####################################################
+ckan.views.default_views = datatables_view geo_view pdf_view
+
+## Theming Settings ############################################################
+ckan.template_title_delimiter = -
+extra_template_paths =
+extra_public_paths =
+ckan.base_public_folder = public
+ckan.base_templates_folder = templates
+ckan.default.package_type = dataset
+ckan.default.group_type = group
+ckan.default.organization_type = organization
+
+## Storage Settings ############################################################
+# This points to the mounted Azure Storage
+# https://learn.microsoft.com/en-us/azure/app-service/configure-connect-to-azure-storage
+ckan.storage_path = <depending-on-env>
+ckan.max_resource_size = 1000
+ckan.max_image_size = 2
+
+## Uploader Settings ###########################################################
+ckan.upload.user.types = image
+ckan.upload.user.mimetypes = image/png image/gif image/jpeg
+ckan.upload.group.types = image
+ckan.upload.group.mimetypes = image/png image/gif image/jpeg
+
+## Webassets Settings ##########################################################
+ckan.webassets.path =
+ckan.webassets.url = /webassets
+ckan.webassets.use_x_sendfile = false
+
+## User Settings ###############################################################
+ckan.user_list_limit = 20
+ckan.user_reset_landing_page = home.index
+
+## Activity Streams Settings ###################################################
+ckan.activity_streams_enabled = true
+ckan.activity_streams_email_notifications = false
+ckan.activity_list_limit = 31
+ckan.activity_list_limit_max = 100
+ckan.email_notifications_since = 2 days
+ckan.hide_activity_from_users = %(ckan.site_id)s
+
+## Feeds Settings ##############################################################
+ckan.feeds.author_name =
+ckan.feeds.author_link =
+ckan.feeds.authority_name =
+ckan.feeds.date =
+ckan.feeds.limit = 20
+
+## Internationalisation Settings ###############################################
+ckan.locale_default = es_AR
+ckan.locales_offered = en fr es ar
+ckan.locales_filtered_out =
+ckan.locale_order =
+ckan.i18n_directory =
+ckan.i18n.extra_directory =
+ckan.i18n.extra_gettext_domain =
+ckan.i18n.extra_locales =
+ckan.i18n.rtl_languages = he ar fa_IR
+ckan.i18n.rtl_theme = css/main-rtl
+ckan.display_timezone = CET
+ckan.root_path =
+ckan.resource_formats = /code/ckan/ckan/config/resource_formats.json
+
+## CKAN tracking ###############################################################
+ckan.tracking_enabled = true
+
+## Form Settings ###############################################################
+ckan.dataset.create_on_ui_requires_resources = true
+package_new_return_url =
+package_edit_return_url =
+licenses_group_url =
+
+## Email settings ##############################################################
+smtp.server = localhost
+smtp.starttls = false
+smtp.user =
+smtp.password =
+smtp.mail_from =
+smtp.reply_to =
+email_to =
+error_email_from =
+
+## Background Job Settings #####################################################
+ckan.jobs.timeout = 180
+
+## DataStore Settings ##########################################################
+ckan.datastore.write_url = <this-will-be-replaced-with-secret>
+ckan.datastore.read_url = <this-will-be-replaced-with-secret>
+
+## Scheming settings
+scheming.dataset_schemas=ckanext.uni.schemas:uni.yaml
+scheming.presets=ckanext.scheming:presets.json
+
+## Datapusher+ #################################################################
+ckan.datapusher.formats = csv xls xlsx xlsm xlsb tsv tab application/csv application/vnd.ms-excel application/vnd.openxmlformats-officedocument.spreadsheetml.sheet ods application/vnd.oasis.opendocument.spreadsheet
+
+## Logging configuration
+[loggers]
+keys = root, ckan, ckanext, werkzeug
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+
+[logger_werkzeug]
+level = WARNING
+handlers = console
+qualname = werkzeug
+propagate = 0
+
+[logger_ckan]
+level = ERROR
+handlers = console
+qualname = ckan
+propagate = 0
+
+[logger_ckanext]
+level = ERROR
+handlers = console
+qualname = ckanext
+propagate = 0
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s
diff --git a/docker/ckan/files/etc/ckan-worker.conf b/docker/ckan/files/etc/ckan-worker.conf
new file mode 100644
index 0000000..f6fc174
--- /dev/null
+++ b/docker/ckan/files/etc/ckan-worker.conf
@@ -0,0 +1,13 @@
+[program:ckan-worker]
+command=ckan -c /srv/app/ckan.ini jobs worker 
+priority=501
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="/srv/app",USER="ckan"
+
diff --git a/docker/ckan/files/patches/.keep b/docker/ckan/files/patches/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/docker/ckan/files/requirements.txt b/docker/ckan/files/requirements.txt
new file mode 100644
index 0000000..e69de29
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
new file mode 100755
index 0000000..04e5ba1
--- /dev/null
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -0,0 +1,89 @@
+#!/bin/bash -e
+echo "Executing entrypoint.sh for $ENV_NAME environment"
+
+if [ "$ENV_NAME" = "local" ] ; then
+    # If we are in the local environment, install the local extensions
+    PREPARE_SCRIPT=$APP_DIR/files/scripts/prepare-local-dev-extensions.sh
+    chmod u+x $PREPARE_SCRIPT
+    $PREPARE_SCRIPT
+fi
+
+if [ -z "$SQLALCHEMY_URL" ]; then
+  echo "SQLALCHEMY_URL is not set. Exiting."
+  exit 1
+fi
+
+# Wait for the database to be ready
+until psql -d $SQLALCHEMY_URL -c '\q'; do
+  echo "Postgres is unavailable - sleeping"
+  sleep 3
+done
+
+echo "Postgres is up - executing command"
+
+# Initialize Datastore
+./scripts/setup-datastore.sh
+
+echo "CKAN DB init"
+ckan db init
+echo "Applying migrations for announcements"
+ckan db upgrade -p announcements
+echo "Applying migrations for uni"
+ckan db upgrade -p uni
+echo "Applying migrations for Datapusher+"
+ckan db upgrade -p datapusher_plus
+echo "Applying migrations for tracking"
+ckan db upgrade -p tracking
+
+# Rebuild search index
+ckan search-index rebuild
+# Update tracking
+LAST_MONTH=$(date -d '60 days ago' +'%Y-%m-%d')
+ckan tracking update $LAST_MONTH
+
+# Datapusher+ requires a valid API token to operate
+echo "Creating a valid API token for Datapusher+"
+DATAPUSHER_TOKEN=$(ckan user token add default datapusher_multi expires_in=365 unit=86400 | tail -n 1 | tr -d '\t')
+ckan config-tool ckan.ini "ckan.datapusher.api_token=${DATAPUSHER_TOKEN}"
+ckan config-tool ckan.ini "ckanext.datapusher_plus.api_token=${DATAPUSHER_TOKEN}"
+
+# Start ssh service to connect to Azure
+service ssh start
+
+# Start supervisor to run CKAN workers (Datapusher+)
+echo "Starting supervisor"
+service supervisor start
+
+# Ensure storage directory with ckan permission (exclude venv which is huge)
+chown -R ckan:ckan $APP_DIR/storage
+
+# Rebuild webassets in can they were patched
+ckan asset build
+
+# If exists, fix $APP_DIR/webassets for local
+if [ -d "$APP_DIR/webassets" ]; then
+    chown -R ckan:ckan $APP_DIR/webassets
+fi
+
+echo "Validating yacron"
+# Validate yacron file
+yacron -c /etc/yacron.d/yacrontab.yaml --validate
+
+echo "Starting yacron"
+# Start yacron in the background
+yacron -c /etc/yacron.d/yacrontab.yaml &
+
+# Execute gunicorn pointing to CKAN's wsgi application
+echo "Starting gunicorn"
+GUNICORN=$APP_DIR/venv/bin/gunicorn
+
+# Start the development server as the ckan user with automatic reload
+if [ "$ENV_NAME" = "local" ] ; then
+    CERT=$APP_DIR/files/cert/localhost.cert
+    KEY=$APP_DIR/files/cert/localhost.key
+    su - ckan -c "$GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$CERT --keyfile=$KEY --reload wsgi:application"
+else
+    su - ckan -c "$GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
+fi
+
+echo "Finished entrypoint.sh"
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
new file mode 100755
index 0000000..7180b16
--- /dev/null
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -e
+
+# load env vars from ${APP_DIR}/.env
+echo "Export envs"
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+echo "Setup python env for python ver $(python3 --version)"
+python3 -m venv ${APP_DIR}/venv
+source ${APP_DIR}/venv/bin/activate
+
+echo "Creating CKAN storage directory: $CKAN_STORAGE_PATH"
+mkdir -p ${APP_DIR}/${CKAN_STORAGE_PATH}
+
+echo "------ Checking out upstream CKAN: $GIT_BRANCH ------"
+cd ${SRC_DIR}
+git clone -b "$GIT_BRANCH" https://github.com/ckan/ckan.git ckan
+cd ckan
+
+echo "------ Installing requirements ------"
+pip install -r requirements.txt
+
+if [ "$ENV_NAME" = "dev" ]; then
+  echo "------ Installing dev requirements ------"
+  pip install -r dev-requirements.txt
+  pip install flask-debugtoolbar
+fi
+
+echo "------ Patch CKAN if required ------"
+cd ${APP_DIR}
+
+PATCH_FOLDER=$APP_DIR/files/patches
+ls -l $PATCH_FOLDER
+
+for dir in ${PATCH_FOLDER}/*; do \
+    for file in $(find "$dir"/*.patch | sort -g); do \
+        abspath=$(readlink -f "$file");
+        echo "$0: Applying patch $abspath";
+        (cd ${APP_DIR}/ckan && git apply "$abspath" --verbose);
+    done ; \
+done
+
+echo "------ Installing CKAN ------"
+pip install .
diff --git a/docker/ckan/files/scripts/prepare-local-dev-extensions.sh b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
new file mode 100755
index 0000000..1e6787d
--- /dev/null
+++ b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+
+# Only run this script in the dev environment
+if [ "$ENV_NAME" != "dev" ]; then
+    echo "ENV_NAME is not 'dev'. Exiting."
+    exit 0
+fi
+
+# From ckan docker base
+# https://github.com/ckan/ckan-docker-base/blob/main/ckan-2.10/dev/setup/start_ckan_development.sh#L9-L48
+# All CKAN extensions in this folder will be installed in the CKAN development environment
+cd $APP_DIR
+
+SRC_EXTENSIONS_DIR=$APP_DIR/src_extensions
+mkdir -p $SRC_EXTENSIONS_DIR
+
+# Install any local extensions in the src_extensions volume
+echo "Looking for local extensions to install..."
+echo "Extension dir contents:"
+ls -la $SRC_EXTENSIONS_DIR
+for i in $SRC_EXTENSIONS_DIR/*
+do
+    if [ -d $i ];
+    then
+
+        if [ -f $i/pip-requirements.txt ];
+        then
+            pip install -r $i/pip-requirements.txt
+            echo "Found requirements file in $i"
+        fi
+        if [ -f $i/requirements.txt ];
+        then
+            pip install -r $i/requirements.txt
+            echo "Found requirements file in $i"
+        fi
+        if [ -f $i/dev-requirements.txt ];
+        then
+            pip install -r $i/dev-requirements.txt
+            echo "Found dev-requirements file in $i"
+        fi
+        if [ -f "$i/setup.py" ] || [ -f "$i/pyproject.toml" ];
+        then
+            cd $i
+            echo "*******************************************"
+            echo "*******************************************"
+            echo "Installing $i ..."
+            pip install -e .
+            echo "$i installed"
+            echo "*******************************************"
+            echo "*******************************************"
+            cd ..
+        fi
+
+        # Point `use` in test.ini to location of `test-core.ini`
+        if [ -f $i/test.ini ];
+        then
+            echo "Updating 'test.ini' reference to 'test-core.ini' for plugin $i"
+            ckan config-tool $i/test.ini "use = config:../../ckan/test-core.ini"
+            if [ "$i" == "$SRC_EXTENSIONS_DIR/ckanext-uni" ];
+            then
+                echo "Updating 'test.ini' to allow testing the extension"
+                ckan config-tool $i/test.ini "sqlalchemy.url = ${SQLALCHEMY_URL}"
+                ckan config-tool $i/test.ini "ckan.redis.url = ${CKAN_REDIS_URL}"
+                ckan config-tool $i/test.ini "solr_url = ${SOLR_URL}"
+                ckan config-tool $i/test.ini "ckan.datastore.write_url = ${DATASTORE_WRITE_URL}"
+                ckan config-tool $i/test.ini "ckan.datastore.read_url = ${DATASTORE_READ_URL}"
+            fi
+        fi
+    fi
+done
+
+cd $APP_DIR
+
+# Allow HTTPS locally
+ckan config-tool ckan.ini "ckan.devserver.ssl_cert = ${APP_DIR}/files/cert/localhost.cert"
+ckan config-tool ckan.ini "ckan.devserver.ssl_key = ${APP_DIR}/files/cert/localhost.key"
+
+echo "prepare-local-dev-extensions Finished"
diff --git a/docker/ckan/files/vars/base.env b/docker/ckan/files/vars/base.env
new file mode 100644
index 0000000..11a3afe
--- /dev/null
+++ b/docker/ckan/files/vars/base.env
@@ -0,0 +1,3 @@
+# The storage path will be inside $APP_DIR
+CKAN_STORAGE_PATH=ckan-storage
+
diff --git a/docker/ckan/files/vars/dev.env b/docker/ckan/files/vars/dev.env
new file mode 100644
index 0000000..19fcccc
--- /dev/null
+++ b/docker/ckan/files/vars/dev.env
@@ -0,0 +1 @@
+CKAN_DEBUG=true

From 8aa3c03496d9242ebac7dc98d92966dfc1d9fb3d Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Fri, 11 Oct 2024 17:09:58 -0300
Subject: [PATCH 02/27] Nowhere

---
 .github/workflows/publish-latest-image.yml    |   4 +-
 docker/.env                                   |  57 ++------
 docker/.env.sample                            |  55 ++++++++
 docker/Makefile                               |  24 ++--
 docker/ckan/Dockerfile                        | 130 ++----------------
 docker/ckan/Dockerfile-prod                   | 128 -----------------
 docker/ckan/ckan-uni-requirements.txt         |  22 ---
 docker/ckan/common/supervisord.conf           |  23 ----
 docker/ckan/common/uwsgi.conf                 |   2 -
 .../100-start-ckanext-harvest.sh              |   4 -
 docker/ckan/files/scripts/entrypoint.sh       |  12 +-
 docker/docker-compose-prod-sample.yml         |  52 -------
 docker/docker-compose.sample.yml              |   6 -
 docker/postgresql/Dockerfile                  |   2 +-
 14 files changed, 99 insertions(+), 422 deletions(-)
 create mode 100644 docker/.env.sample
 delete mode 100644 docker/ckan/Dockerfile-prod
 delete mode 100644 docker/ckan/ckan-uni-requirements.txt
 delete mode 100644 docker/ckan/common/supervisord.conf
 delete mode 100644 docker/ckan/common/uwsgi.conf
 delete mode 100644 docker/ckan/docker-entrypoint.d/100-start-ckanext-harvest.sh
 delete mode 100644 docker/docker-compose-prod-sample.yml

diff --git a/.github/workflows/publish-latest-image.yml b/.github/workflows/publish-latest-image.yml
index 8a422fa..5a85caf 100644
--- a/.github/workflows/publish-latest-image.yml
+++ b/.github/workflows/publish-latest-image.yml
@@ -2,7 +2,7 @@ name: Build and publish production docker-ckan image version
 on: 
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
@@ -21,6 +21,6 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ckan-2.9/ckan
-          file: ckan-2.9/ckan/Dockerfile-prod
+          file: ckan-2.9/ckan/Dockerfile
           push: true
           tags: avdata99/ckan-env:latest
diff --git a/docker/.env b/docker/.env
index c5b7dc8..036ce1f 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,4 +1,9 @@
-CKAN_UNI_VERSION=0.1.4
+ENV_NAME=dev
+CKAN_UNI_VERSION=0.2.0
+CKAN_STORAGE_PATH=storage
+CKAN_GIT_URL=https://github.com/ckan/ckan.git
+CKAN_GIT_BRANCH=ckan-2.10.5
+TZ=America/Argentina/Cordoba
 
 # DB image settings
 POSTGRES_PASSWORD=ckan
@@ -11,7 +16,7 @@ CKAN_PORT=5000
 CKAN_SYSADMIN_NAME=ckan_admin
 CKAN_SYSADMIN_PASSWORD=test1234
 CKAN_SYSADMIN_EMAIL=your_email@example.com
-TZ=America/Argentina/Cordoba
+
 
 CKAN_DATASET_PER_PAGE = 5
 
@@ -43,55 +48,9 @@ CKAN_SMTP_MAIL_FROM=ckan@localhost
 
 # Extensions
 
-CKAN__PLUGINS=envvars stats image_view text_view recline_view recline_grid_view recline_graph_view datatables_view webpage_view ui_universidad datastore xloader pages harvest siu siu_transp_harvester datasetpreview linechart barchart piechart basicgrid
+CKAN__PLUGINS=
 
 CKAN__HARVEST__MQ__TYPE=redis
 CKAN__HARVEST__MQ__HOSTNAME=redis
 CKAN__HARVEST__MQ__PORT=6379
 CKAN__HARVEST__MQ__REDIS_DB=1
-
-# XLoader
-
-# Default of an sqlite file is fine for development. For production use a
-# Postgresql database.
-CKANEXT__XLOADER__JOBS_DB__URI=sqlite:////tmp/xloader_jobs.db
-
-# The formats that are accepted. If the value of the resource.format is
-# anything else then it won't be 'xloadered' to DataStore (and will therefore
-# only be available to users in the form of the original download/link).
-# Case insensitive.
-# (optional, defaults are listed in plugin.py - DEFAULT_FORMATS).
-CKANEXT__XLOADER__FORMATS=csv application/csv xls application/vnd.ms-excel
-
-# The maximum size of files to load into DataStore. In bytes. Default is 1 GB.
-CKANEXT__XLOADER__MAX_CONTENT_LENGTH=1000000000
-
-# To always use messytables to load data, instead of attempting a direct
-# PostgreSQL COPY, set this to True. This more closely matches the
-# DataPusher's behavior. It has the advantage that the column types
-# are guessed. However it is more error prone, far slower and you can't run
-# the CPU-intensive queue on a separate machine.
-CKANEXT__XLOADER__JUST_LOAD_WITH_MESSYTABLES=False
-
-# The maximum time for the loading of a resource before it is aborted.
-# Give an amount in seconds. Default is 60 minutes
-CKANEXT__XLOADER__JOB_TIMEOUT=3600
-
-# Ignore the file hash when submitting to the DataStore, if set to True
-# resources are always submitted (if their format matches), if set to
-# False (default), resources are only submitted if their hash has changed.
-CKANEXT__XLOADER__IGNORE_HASH=False
-
-# When loading a file that is bigger than `max_content_length`, xloader can
-# still try and load some of the file, which is useful to display a
-# preview. Set this option to the desired number of lines/rows that it
-# loads in this case.
-# If the file-type is supported (CSV, TSV) an excerpt with the number of
-# `max_excerpt_lines` lines will be submitted while the `max_content_length`
-# is not exceeded.
-# If set to 0 (default) files that exceed the `max_content_length` will
-# not be loaded into the datastore.
-CKANEXT__XLOADER__MAX_EXCERPT_LINES=100
-
-# No solo gráficos que tengan extras definidos
-CKANEXT__DATASETPREVIEW__DRAW='ALL'
diff --git a/docker/.env.sample b/docker/.env.sample
new file mode 100644
index 0000000..7c01d67
--- /dev/null
+++ b/docker/.env.sample
@@ -0,0 +1,55 @@
+ENV_NAME=dev
+CKAN_UNI_VERSION=0.2.0
+CKAN_STORAGE_PATH=storage
+CKAN_GIT_URL=https://github.com/ckan/ckan.git
+CKAN_GIT_BRANCH=ckan-2.10.5
+TZ=America/Argentina/Cordoba
+
+# DB image settings
+POSTGRES_PASSWORD=ckan
+DATASTORE_READONLY_PASSWORD=datastore
+
+# Basic
+CKAN_SITE_ID=default
+CKAN_SITE_URL=http://ckan:5000
+CKAN_PORT=5000
+CKAN_SYSADMIN_NAME=ckan_admin
+CKAN_SYSADMIN_PASSWORD=test1234
+CKAN_SYSADMIN_EMAIL=your_email@example.com
+
+CKAN_DATASET_PER_PAGE = 5
+
+# Database connections (TODO: avoid duplication)
+CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
+CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
+CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
+
+# Test database connections
+TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
+TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
+TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
+
+# Other services connections
+CKAN_SOLR_URL=http://solr:8983/solr/ckan
+CKAN_REDIS_URL=redis://redis:6379/1
+
+TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
+TEST_CKAN_REDIS_URL=redis://redis:6379/1
+
+# Core settings
+CKAN__STORAGE_PATH=/var/lib/ckan
+
+CKAN_SMTP_SERVER=smtp.corporateict.domain:25
+CKAN_SMTP_STARTTLS=True
+CKAN_SMTP_USER=user
+CKAN_SMTP_PASSWORD=pass
+CKAN_SMTP_MAIL_FROM=ckan@localhost
+
+# Extensions
+
+CKAN__PLUGINS=
+
+CKAN__HARVEST__MQ__TYPE=redis
+CKAN__HARVEST__MQ__HOSTNAME=redis
+CKAN__HARVEST__MQ__PORT=6379
+CKAN__HARVEST__MQ__REDIS_DB=1
diff --git a/docker/Makefile b/docker/Makefile
index 7cdc7e6..cb9da71 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,7 +1,20 @@
 .PHONY: build clean up debug
 	
 build:
-	docker-compose build
+	@if [ ! -f .env ]; then cp .env.example .env; fi
+	@if [ ! -f docker-compose.yml ]; then cp docker-compose.example.yml docker-compose.yml; fi
+	$(eval -include .env)
+	BUILDKIT_PROGRESS=plain docker build \
+		--file ckan/Dockerfile \
+		--build-arg ENV_NAME=${ENV_NAME} \
+		--build-arg CKAN_GIT_URL=${CKAN_GIT_URL} \
+		--build-arg CKAN_GIT_BRANCH=${CKAN_GIT_BRANCH} \
+		--build-arg TZ=${TZ} \
+		-t unckan:${ENV_NAME} ckan
+	docker compose build
+
+down:
+	docker-compose down
 
 clean:
 	docker-compose down -v --remove-orphans
@@ -17,14 +30,5 @@ build-up:
 	docker-compose build
 	docker-compose up
 
-gather:
-	docker-compose exec ckan ckan harvester gather-consumer
-
-fetch:
-	docker-compose exec ckan ckan harvester fetch-consumer
-
-harvest-run:
-	docker-compose exec ckan ckan harvester run
-
 ckan-worker:
 	docker-compose exec ckan ckan jobs worker
diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 796c812..0d41615 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -1,130 +1,28 @@
-FROM alpine:3.13
+FROM debian:stable-slim
+
+# Args
+ARG TZ
+ARG CKAN_GIT_URL
+ARG CKAN_GIT_BRANCH
 
 # Internals, you probably don't need to change these
-ENV APP_DIR=/srv/app
-ENV SRC_DIR=/srv/app/src
+ENV APP_DIR=/app/unckan
 ENV CKAN_INI=${APP_DIR}/ckan.ini
-ENV PIP_SRC=${SRC_DIR}
-ENV CKAN_STORAGE_PATH=/var/lib/ckan
-ENV GIT_URL=https://github.com/ckan/ckan.git
-# CKAN version to build
-ENV GIT_BRANCH=ckan-2.9.8
-# Customize these on the .env file if needed
-ENV CKAN_SITE_URL=http://localhost:5000
-ENV CKAN__PLUGINS image_view text_view recline_view datastore envvars
 
 WORKDIR ${APP_DIR}
+# RUN mkdir -p ${APP_DIR}
 
-# Install necessary packages to run CKAN
-RUN apk add --no-cache tzdata \
-        git \
-        gettext \
-        postgresql-client \
-        python3 \
-        libxml2 \
-        libxslt \
-        musl-dev \
-        uwsgi \
-        uwsgi-http \
-        uwsgi-corerouter \
-        uwsgi-python \
-        py3-gevent \
-        uwsgi-gevent \
-        libmagic \
-        curl \
-        patch \
-        sudo && \
-    # Packages to build CKAN requirements and plugins
-    apk add --no-cache --virtual .build-deps \
-        postgresql-dev \
-        gcc \
-        make \
-        g++ \
-        autoconf \
-        automake \
-    	libtool \
-        python3-dev \
-        libxml2-dev \
-        libxslt-dev \
-        linux-headers \
-        openssl-dev \
-        libffi-dev \
-        cargo && \
-    # Create SRC_DIR
-    mkdir -p ${SRC_DIR} && \
-    # Install pip, supervisord and uwsgi
-    curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
-    python3 ${SRC_DIR}/get-pip.py && \
-    pip3 install -U pip && \
-    pip3 install supervisor && \
-    mkdir /etc/supervisord.d && \
-    #pip wheel --wheel-dir=/wheels uwsgi gevent && \
-    rm -rf ${SRC_DIR}/get-pip.py
-
-COPY common/supervisord.conf /etc
-
-# Install CKAN
-RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
-    cd ${SRC_DIR}/ckan && \
-    cp who.ini ${APP_DIR} && \
-    pip3 install -r requirement-setuptools.txt && \
-    pip3 install --no-binary :all: -r requirements.txt && \
-    # Install CKAN envvars to support loading config from environment variables
-    pip3 install -e git+https://github.com/okfn/ckanext-envvars.git#egg=ckanext-envvars && \
-    # Create and update CKAN config
-    ckan generate config ${CKAN_INI} && \
-    ckan config-tool ${CKAN_INI} "ckan.plugins = ${CKAN__PLUGINS}" && \
-    ckan config-tool ${CKAN_INI} "ckan.site_url = ${CKAN__SITE_URL}"
-
-# Create a local user and group to run the app
-RUN addgroup -g 92 -S ckan && \
-    adduser -u 92 -h /srv/app -H -D -S -G ckan ckan
-
-# Create local storage folder
-RUN mkdir -p $CKAN_STORAGE_PATH && \
-    chown -R ckan:ckan $CKAN_STORAGE_PATH
+COPY files ${APP_DIR}/files
 
-COPY setup/prerun.py ${APP_DIR}
-COPY setup/supervisor.worker.conf /etc/supervisord.d/worker.conf
-COPY setup/start_ckan.sh ${APP_DIR}
-COPY setup/start_ckan_dev.sh ${APP_DIR}
-ADD https://raw.githubusercontent.com/ckan/ckan/${GIT_BRANCH}/wsgi.py ${APP_DIR}
+# Create the ckan user
+RUN useradd -m -s /bin/bash ckan
 
-# Create entrypoint directory for children image scripts
-ONBUILD RUN mkdir /docker-entrypoint.d
-COPY docker-entrypoint.d/* /docker-entrypoint.d/
-
-RUN chown ckan -R /srv/app
+RUN chown ckan -R ${APP_DIR}
 
 EXPOSE 5000
 
 HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 
-# Set timezone
-ARG TZ
-# RUN echo $TZ > /etc/timezone
-# RUN cp /usr/share/zoneinfo/$TZ /etc/localtime
-
-RUN echo America/Argentina/Cordoba > /etc/timezone
-RUN cp /usr/share/zoneinfo/America/Argentina/Cordoba /etc/localtime
-
-# Install this project requirements
-COPY ckan-uni-requirements.txt ${APP_DIR}
-RUN pip3 install -r ${APP_DIR}/ckan-uni-requirements.txt
-
-# Apply any patches needed to CKAN core or any of the built extensions (not the
-# runtime mounted ones)
-# See https://github.com/okfn/docker-ckan#applying-patches
-COPY patches ${APP_DIR}/patches
-
-RUN for d in $APP_DIR/patches/*; do \
-        if [ -d $d ]; then \
-            for f in `ls $d/*.patch | sort -g`; do \
-                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
-            done ; \
-        fi ; \
-    done
+EXPOSE 5000 2222
 
-ENV SRC_EXTENSIONS_DIR=/srv/app/src_extensions
-RUN pip3 install flask-debugtoolbar
-CMD ["/srv/app/start_ckan_dev.sh"]
+ENTRYPOINT [ "./files/scripts/entrypoint.sh" ]
diff --git a/docker/ckan/Dockerfile-prod b/docker/ckan/Dockerfile-prod
deleted file mode 100644
index 098b10a..0000000
--- a/docker/ckan/Dockerfile-prod
+++ /dev/null
@@ -1,128 +0,0 @@
-FROM alpine:3.13
-
-# Internals, you probably don't need to change these
-ENV APP_DIR=/srv/app
-ENV SRC_DIR=/srv/app/src
-ENV CKAN_INI=${APP_DIR}/ckan.ini
-ENV PIP_SRC=${SRC_DIR}
-ENV CKAN_STORAGE_PATH=/var/lib/ckan
-ENV GIT_URL=https://github.com/ckan/ckan.git
-# CKAN version to build
-ENV GIT_BRANCH=ckan-2.9.8
-# Customize these on the .env file if needed
-ENV CKAN_SITE_URL=http://localhost:5000
-ENV CKAN__PLUGINS image_view text_view recline_view datastore envvars
-
-WORKDIR ${APP_DIR}
-
-# Install necessary packages to run CKAN
-RUN apk add --no-cache tzdata \
-        git \
-        gettext \
-        postgresql-client \
-        python3 \
-        libxml2 \
-        libxslt \
-        musl-dev \
-        uwsgi \
-        uwsgi-http \
-        uwsgi-corerouter \
-        uwsgi-python \
-        py3-gevent \
-        uwsgi-gevent \
-        libmagic \
-        curl \
-        patch \
-        sudo && \
-    # Packages to build CKAN requirements and plugins
-    apk add --no-cache --virtual .build-deps \
-        postgresql-dev \
-        gcc \
-        make \
-        g++ \
-        autoconf \
-        automake \
-    	libtool \
-        python3-dev \
-        libxml2-dev \
-        libxslt-dev \
-        linux-headers \
-        openssl-dev \
-        libffi-dev \
-        cargo && \
-    # Create SRC_DIR
-    mkdir -p ${SRC_DIR} && \
-    # Install pip, supervisord and uwsgi
-    curl -o ${SRC_DIR}/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
-    python3 ${SRC_DIR}/get-pip.py && \
-    pip3 install -U pip && \
-    pip3 install supervisor && \
-    mkdir /etc/supervisord.d && \
-    #pip wheel --wheel-dir=/wheels uwsgi gevent && \
-    rm -rf ${SRC_DIR}/get-pip.py
-
-COPY common/supervisord.conf /etc
-
-# Install CKAN
-RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
-    cd ${SRC_DIR}/ckan && \
-    cp who.ini ${APP_DIR} && \
-    pip3 install -r requirement-setuptools.txt && \
-    pip3 install --no-binary :all: -r requirements.txt && \
-    # Install CKAN envvars to support loading config from environment variables
-    pip3 install -e git+https://github.com/okfn/ckanext-envvars.git#egg=ckanext-envvars && \
-    # Create and update CKAN config
-    ckan generate config ${CKAN_INI} && \
-    ckan config-tool ${CKAN_INI} "ckan.plugins = ${CKAN__PLUGINS}" && \
-    ckan config-tool ${CKAN_INI} "ckan.site_url = ${CKAN__SITE_URL}"
-
-# Create a local user and group to run the app
-RUN addgroup -g 92 -S ckan && \
-    adduser -u 92 -h /srv/app -H -D -S -G ckan ckan
-
-# Create local storage folder
-RUN mkdir -p $CKAN_STORAGE_PATH && \
-    chown -R ckan:ckan $CKAN_STORAGE_PATH
-
-COPY setup/prerun.py ${APP_DIR}
-COPY setup/supervisor.worker.conf /etc/supervisord.d/worker.conf
-COPY setup/start_ckan.sh ${APP_DIR}
-COPY setup/start_ckan_dev.sh ${APP_DIR}
-ADD https://raw.githubusercontent.com/ckan/ckan/${GIT_BRANCH}/wsgi.py ${APP_DIR}
-
-# Create entrypoint directory for children image scripts
-ONBUILD RUN mkdir /docker-entrypoint.d
-COPY docker-entrypoint.d/* /docker-entrypoint.d/
-
-RUN chown ckan -R /srv/app
-
-EXPOSE 5000
-
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
-
-# Set timezone
-ARG TZ
-# RUN echo $TZ > /etc/timezone
-# RUN cp /usr/share/zoneinfo/$TZ /etc/localtime
-
-RUN echo America/Argentina/Cordoba > /etc/timezone
-RUN cp /usr/share/zoneinfo/America/Argentina/Cordoba /etc/localtime
-
-# Install this project requirements
-COPY ckan-uni-requirements.txt ${APP_DIR}
-RUN pip3 install -r ${APP_DIR}/ckan-uni-requirements.txt
-
-# Apply any patches needed to CKAN core or any of the built extensions (not the
-# runtime mounted ones)
-# See https://github.com/okfn/docker-ckan#applying-patches
-COPY patches ${APP_DIR}/patches
-
-RUN for d in $APP_DIR/patches/*; do \
-        if [ -d $d ]; then \
-            for f in `ls $d/*.patch | sort -g`; do \
-                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
-            done ; \
-        fi ; \
-    done
-
-CMD ["/srv/app/start_ckan.sh"]
diff --git a/docker/ckan/ckan-uni-requirements.txt b/docker/ckan/ckan-uni-requirements.txt
deleted file mode 100644
index cab9564..0000000
--- a/docker/ckan/ckan-uni-requirements.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-siu-data>=0.3.5
-ckantoolkit==0.0.3
-pika>=1.1.0
-pyOpenSSL==18.0.0
-# redis>=3.5.3
-redis>=2.10.6
-six>=1.12.0
-messytables==0.15.2
-Unidecode==1.0.22
-requests>=2.23.0
-python-slugify>=1.2.6
-pyexcel>=-0.5.15
-pyexcel-xls>=0.5.8
-pyexcel-xlsx>=0.5.8
-
--e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest
--e git+https://github.com/ckan/ckanext-pages.git#egg=ckanext-pages
--e git+https://github.com/ckan/ckanext-xloader.git#egg=ckanext-xloader
--e git+https://github.com/unckan/ckanext-siu-harvester.git#egg=ckanext-siu-harvester
--e git+https://github.com/unckan/ckanext-datasetpreview.git#egg=ckanext-datasetpreview
--e git+https://github.com/localidata/ckanext-basiccharts.git#egg=ckanext-basiccharts
--e git+https://github.com/unckan/ckanext-ui-universidad.git#egg=ckanext-ui-universidad
diff --git a/docker/ckan/common/supervisord.conf b/docker/ckan/common/supervisord.conf
deleted file mode 100644
index a3f6671..0000000
--- a/docker/ckan/common/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[unix_http_server]
-file = /tmp/supervisor.sock
-chmod = 0777
-chown = nobody:nogroup
-
-[supervisord]
-logfile = /tmp/supervisord.log
-logfile_maxbytes = 50MB
-logfile_backups=10
-loglevel = info
-pidfile = /tmp/supervisord.pid
-nodaemon = true
-umask = 022
-identifier = supervisor
-
-[supervisorctl]
-serverurl = unix:///tmp/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[include]
-files = /etc/supervisord.d/*.conf
diff --git a/docker/ckan/common/uwsgi.conf b/docker/ckan/common/uwsgi.conf
deleted file mode 100644
index 6321d6d..0000000
--- a/docker/ckan/common/uwsgi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[uwsgi]
-route = ^(?!/api).*$ basicauth:Restricted,/srv/app/.htpasswd
diff --git a/docker/ckan/docker-entrypoint.d/100-start-ckanext-harvest.sh b/docker/ckan/docker-entrypoint.d/100-start-ckanext-harvest.sh
deleted file mode 100644
index a2120cb..0000000
--- a/docker/ckan/docker-entrypoint.d/100-start-ckanext-harvest.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Enabling ckanext-harvest"
-ckan --config=$CKAN_INI harvester initdb
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index 04e5ba1..91f794a 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -1,5 +1,10 @@
 #!/bin/bash -e
 echo "Executing entrypoint.sh for $ENV_NAME environment"
+while TRUE:
+do
+    echo "Waiting for database to be ready..."
+    sleep 3
+done
 
 if [ "$ENV_NAME" = "local" ] ; then
     # If we are in the local environment, install the local extensions
@@ -30,16 +35,9 @@ echo "Applying migrations for announcements"
 ckan db upgrade -p announcements
 echo "Applying migrations for uni"
 ckan db upgrade -p uni
-echo "Applying migrations for Datapusher+"
-ckan db upgrade -p datapusher_plus
-echo "Applying migrations for tracking"
-ckan db upgrade -p tracking
 
 # Rebuild search index
 ckan search-index rebuild
-# Update tracking
-LAST_MONTH=$(date -d '60 days ago' +'%Y-%m-%d')
-ckan tracking update $LAST_MONTH
 
 # Datapusher+ requires a valid API token to operate
 echo "Creating a valid API token for Datapusher+"
diff --git a/docker/docker-compose-prod-sample.yml b/docker/docker-compose-prod-sample.yml
deleted file mode 100644
index 1325c7a..0000000
--- a/docker/docker-compose-prod-sample.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-version: "3"
-
-services:
-  ckan:
-    build:
-      context: ckan/
-      dockerfile: Dockerfile-prod
-      args:
-        - TZ=${TZ}
-    env_file:
-      - .env
-    links:
-      - db
-      - solr
-      - redis
-    ports:
-      - "0.0.0.0:${CKAN_PORT}:5000"
-    volumes:
-      - ./src:/srv/app/src_extensions
-      - ckan_storage:/var/lib/ckan
-
-  db:
-    container_name: db
-    build:
-      context: postgresql/
-      args:
-        - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD}
-        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    environment:
-      - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - PGDATA=/var/lib/postgresql/data/db
-    volumes:
-      - pg_data:/var/lib/postgresql/data
-
-  solr:
-    container_name: solr
-    build:
-      context: solr/
-    ports:
-      - "8983:8983"
-    volumes:
-      - solr_data:/opt/solr/server/solr/ckan/data/index
-
-  redis:
-    container_name: redis
-    image: redis:alpine
-
-volumes:
-  ckan_storage:
-  pg_data:
-  solr_data:
diff --git a/docker/docker-compose.sample.yml b/docker/docker-compose.sample.yml
index 1db79f8..89721dc 100644
--- a/docker/docker-compose.sample.yml
+++ b/docker/docker-compose.sample.yml
@@ -1,14 +1,8 @@
-version: "3"
-
 services:
   ckan:
     build:
       context: ckan/
       dockerfile: Dockerfile
-      args:
-        - TZ=${TZ}
-    env_file:
-      - .env
     links:
       - db
       - solr
diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
index e912383..42ea06f 100644
--- a/docker/postgresql/Dockerfile
+++ b/docker/postgresql/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12-alpine
+FROM postgres:15-alpine
 
 # Allow connections; we don't map out any ports so only linked docker containers can connect
 RUN echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf

From 3237ccc8ac83470949e209f3d6954eeb51ebc173 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Sun, 13 Oct 2024 20:46:48 -0300
Subject: [PATCH 03/27] More install

---
 .gitignore                                   |  1 +
 docker/.env                                  | 56 --------------------
 docker/.env.sample                           | 55 -------------------
 docker/Makefile                              | 10 ++--
 docker/ckan/Dockerfile                       | 12 ++++-
 docker/ckan/files/env/base.env               | 14 +++++
 docker/ckan/files/env/prod.env               |  1 +
 docker/ckan/files/scripts/build-env-vars.sh  | 35 ++++++++++++
 docker/ckan/files/scripts/entrypoint.sh      |  3 +-
 docker/ckan/files/scripts/install-ckan.sh    | 15 ++++--
 docker/ckan/files/scripts/install-os-deps.sh | 23 ++++++++
 11 files changed, 100 insertions(+), 125 deletions(-)
 delete mode 100644 docker/.env
 delete mode 100644 docker/.env.sample
 create mode 100644 docker/ckan/files/env/base.env
 create mode 100644 docker/ckan/files/env/prod.env
 create mode 100755 docker/ckan/files/scripts/build-env-vars.sh
 create mode 100755 docker/ckan/files/scripts/install-os-deps.sh

diff --git a/.gitignore b/.gitignore
index dec81cf..729bb03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ docker-compose.yml
 docker-compose-prod.yml
 
 docker/src/*
+docker/ckan/files/env/local.env
 
 *.pyc
 *.pyo
diff --git a/docker/.env b/docker/.env
deleted file mode 100644
index 036ce1f..0000000
--- a/docker/.env
+++ /dev/null
@@ -1,56 +0,0 @@
-ENV_NAME=dev
-CKAN_UNI_VERSION=0.2.0
-CKAN_STORAGE_PATH=storage
-CKAN_GIT_URL=https://github.com/ckan/ckan.git
-CKAN_GIT_BRANCH=ckan-2.10.5
-TZ=America/Argentina/Cordoba
-
-# DB image settings
-POSTGRES_PASSWORD=ckan
-DATASTORE_READONLY_PASSWORD=datastore
-
-# Basic
-CKAN_SITE_ID=default
-CKAN_SITE_URL=http://ckan:5000
-CKAN_PORT=5000
-CKAN_SYSADMIN_NAME=ckan_admin
-CKAN_SYSADMIN_PASSWORD=test1234
-CKAN_SYSADMIN_EMAIL=your_email@example.com
-
-
-CKAN_DATASET_PER_PAGE = 5
-
-# Database connections (TODO: avoid duplication)
-CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
-CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
-CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
-
-# Test database connections
-TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
-TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
-TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
-
-# Other services connections
-CKAN_SOLR_URL=http://solr:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis:6379/1
-
-TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
-TEST_CKAN_REDIS_URL=redis://redis:6379/1
-
-# Core settings
-CKAN__STORAGE_PATH=/var/lib/ckan
-
-CKAN_SMTP_SERVER=smtp.corporateict.domain:25
-CKAN_SMTP_STARTTLS=True
-CKAN_SMTP_USER=user
-CKAN_SMTP_PASSWORD=pass
-CKAN_SMTP_MAIL_FROM=ckan@localhost
-
-# Extensions
-
-CKAN__PLUGINS=
-
-CKAN__HARVEST__MQ__TYPE=redis
-CKAN__HARVEST__MQ__HOSTNAME=redis
-CKAN__HARVEST__MQ__PORT=6379
-CKAN__HARVEST__MQ__REDIS_DB=1
diff --git a/docker/.env.sample b/docker/.env.sample
deleted file mode 100644
index 7c01d67..0000000
--- a/docker/.env.sample
+++ /dev/null
@@ -1,55 +0,0 @@
-ENV_NAME=dev
-CKAN_UNI_VERSION=0.2.0
-CKAN_STORAGE_PATH=storage
-CKAN_GIT_URL=https://github.com/ckan/ckan.git
-CKAN_GIT_BRANCH=ckan-2.10.5
-TZ=America/Argentina/Cordoba
-
-# DB image settings
-POSTGRES_PASSWORD=ckan
-DATASTORE_READONLY_PASSWORD=datastore
-
-# Basic
-CKAN_SITE_ID=default
-CKAN_SITE_URL=http://ckan:5000
-CKAN_PORT=5000
-CKAN_SYSADMIN_NAME=ckan_admin
-CKAN_SYSADMIN_PASSWORD=test1234
-CKAN_SYSADMIN_EMAIL=your_email@example.com
-
-CKAN_DATASET_PER_PAGE = 5
-
-# Database connections (TODO: avoid duplication)
-CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
-CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
-CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
-
-# Test database connections
-TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
-TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
-TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
-
-# Other services connections
-CKAN_SOLR_URL=http://solr:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis:6379/1
-
-TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
-TEST_CKAN_REDIS_URL=redis://redis:6379/1
-
-# Core settings
-CKAN__STORAGE_PATH=/var/lib/ckan
-
-CKAN_SMTP_SERVER=smtp.corporateict.domain:25
-CKAN_SMTP_STARTTLS=True
-CKAN_SMTP_USER=user
-CKAN_SMTP_PASSWORD=pass
-CKAN_SMTP_MAIL_FROM=ckan@localhost
-
-# Extensions
-
-CKAN__PLUGINS=
-
-CKAN__HARVEST__MQ__TYPE=redis
-CKAN__HARVEST__MQ__HOSTNAME=redis
-CKAN__HARVEST__MQ__PORT=6379
-CKAN__HARVEST__MQ__REDIS_DB=1
diff --git a/docker/Makefile b/docker/Makefile
index cb9da71..3b00673 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,17 +1,15 @@
 .PHONY: build clean up debug
-	
+
 build:
-	@if [ ! -f .env ]; then cp .env.example .env; fi
 	@if [ ! -f docker-compose.yml ]; then cp docker-compose.example.yml docker-compose.yml; fi
-	$(eval -include .env)
+	$(eval TZ ?= America/Argentina/Cordoba)
+	$(eval ENV_NAME ?= local)
 	BUILDKIT_PROGRESS=plain docker build \
 		--file ckan/Dockerfile \
 		--build-arg ENV_NAME=${ENV_NAME} \
-		--build-arg CKAN_GIT_URL=${CKAN_GIT_URL} \
-		--build-arg CKAN_GIT_BRANCH=${CKAN_GIT_BRANCH} \
 		--build-arg TZ=${TZ} \
 		-t unckan:${ENV_NAME} ckan
-	docker compose build
+	# docker compose build
 
 down:
 	docker-compose down
diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 0d41615..844c8a1 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -2,8 +2,7 @@ FROM debian:stable-slim
 
 # Args
 ARG TZ
-ARG CKAN_GIT_URL
-ARG CKAN_GIT_BRANCH
+ARG ENV_NAME
 
 # Internals, you probably don't need to change these
 ENV APP_DIR=/app/unckan
@@ -14,6 +13,15 @@ WORKDIR ${APP_DIR}
 
 COPY files ${APP_DIR}/files
 
+# Prepare the environment vars
+RUN ${APP_DIR}/files/scripts/build-env-vars.sh
+
+# Install OS dependencies
+RUN ${APP_DIR}/files/scripts/install-os-deps.sh
+
+# Install CKAN
+RUN ${APP_DIR}/files/scripts/install-ckan.sh
+
 # Create the ckan user
 RUN useradd -m -s /bin/bash ckan
 
diff --git a/docker/ckan/files/env/base.env b/docker/ckan/files/env/base.env
new file mode 100644
index 0000000..ab68efa
--- /dev/null
+++ b/docker/ckan/files/env/base.env
@@ -0,0 +1,14 @@
+# Do not change this file for your local env
+# Use local.env to set your local env variables
+
+CKAN_UNI_VERSION=0.2.0
+CKAN_GIT_URL=https://github.com/ckan/ckan.git
+CKAN_GIT_BRANCH=ckan-2.10.5
+PY_VERSION=3.11
+
+# A folder for storing uploaded (and other) files in $APP_DIR
+CKAN_STORAGE_FOLDER=storage
+
+# Define if this env is for development
+# This will load dev requirements and prepare the app for development
+IS_DEV_ENV=true
diff --git a/docker/ckan/files/env/prod.env b/docker/ckan/files/env/prod.env
new file mode 100644
index 0000000..e97254f
--- /dev/null
+++ b/docker/ckan/files/env/prod.env
@@ -0,0 +1 @@
+IS_DEV_ENV=false
diff --git a/docker/ckan/files/scripts/build-env-vars.sh b/docker/ckan/files/scripts/build-env-vars.sh
new file mode 100755
index 0000000..c4fafb8
--- /dev/null
+++ b/docker/ckan/files/scripts/build-env-vars.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Use files/env/base.env as base environment variables and then apply
+# the current ENV_NAME to override the base variables.
+
+if [ -z "$ENV_NAME" ]; then
+  echo "ENV_NAME is not set. Exiting."
+  exit 1
+fi
+
+echo "Building UNCKAN for ${ENV_NAME} env"
+
+cat ${APP_DIR}/files/env/base.env > ${APP_DIR}/.env
+# if the ${APP_DIR}/files/env/${ENV_NAME}.env file exists, append it
+# to the .env file
+if [ ! -f ${APP_DIR}/files/env/${ENV_NAME}.env ]; then
+  echo "No env file found for ${ENV_NAME}! Continue"
+else
+    # ensure a newline at the end of the file
+    echo "" >> ${APP_DIR}/.env
+    cat ${APP_DIR}/files/env/${ENV_NAME}.env >> ${APP_DIR}/.env
+fi
+
+# Load env vars from ${APP_DIR}/.env to test them
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+# Validate basic env vars
+VALIDATE_VARS="CKAN_GIT_URL CKAN_GIT_BRANCH"
+for VAR in $VALIDATE_VARS; do
+  if [ -z "${!VAR}" ]; then
+    echo "$VAR is not set. Exiting."
+    exit 1
+  fi
+done
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index 91f794a..5297616 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 echo "Executing entrypoint.sh for $ENV_NAME environment"
-while TRUE:
+# infinite loop
+while true;
 do
     echo "Waiting for database to be ready..."
     sleep 3
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
index 7180b16..80f0433 100755
--- a/docker/ckan/files/scripts/install-ckan.sh
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -1,7 +1,9 @@
 #!/bin/bash -e
 
+echo "Installing CKAN ..."
+
+
 # load env vars from ${APP_DIR}/.env
-echo "Export envs"
 set -o allexport
 . ${APP_DIR}/.env
 set +o allexport
@@ -10,8 +12,8 @@ echo "Setup python env for python ver $(python3 --version)"
 python3 -m venv ${APP_DIR}/venv
 source ${APP_DIR}/venv/bin/activate
 
-echo "Creating CKAN storage directory: $CKAN_STORAGE_PATH"
-mkdir -p ${APP_DIR}/${CKAN_STORAGE_PATH}
+echo "Creating CKAN storage directory: $CKAN_STORAGE_FOLDER"
+mkdir -p ${APP_DIR}/${CKAN_STORAGE_FOLDER}
 
 echo "------ Checking out upstream CKAN: $GIT_BRANCH ------"
 cd ${SRC_DIR}
@@ -21,7 +23,8 @@ cd ckan
 echo "------ Installing requirements ------"
 pip install -r requirements.txt
 
-if [ "$ENV_NAME" = "dev" ]; then
+# The boolean IS_DEV_ENV define if we need to install dev requirements
+if [ "$IS_DEV_ENV" = "true" ] ; then
   echo "------ Installing dev requirements ------"
   pip install -r dev-requirements.txt
   pip install flask-debugtoolbar
@@ -41,5 +44,7 @@ for dir in ${PATCH_FOLDER}/*; do \
     done ; \
 done
 
-echo "------ Installing CKAN ------"
+echo "Installing CKAN package"
 pip install .
+
+echo "CKAN installed"
diff --git a/docker/ckan/files/scripts/install-os-deps.sh b/docker/ckan/files/scripts/install-os-deps.sh
new file mode 100755
index 0000000..9b20665
--- /dev/null
+++ b/docker/ckan/files/scripts/install-os-deps.sh
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+
+echo "Installing OS dependencies"
+
+# load env vars from ${APP_DIR}/.env
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+apt update
+
+# Install Python according to PY_VERSION
+apt install -y software-properties-common wget gnupg
+
+# Add deadsnakes PPA manually
+wget -qO - https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6A755776 | gpg --dearmor -o /usr/share/keyrings/deadsnakes-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/deadsnakes-archive-keyring.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main" > /etc/apt/sources.list.d/deadsnakes-ppa.list
+apt install -y python${PY_VERSION} python${PY_VERSION}-dev python3-pip python3-venv
+
+# Define python alias for the version installed
+ln -s /usr/bin/python${PY_VERSION} /usr/bin/python
+
+echo "Python installed $(python --version)"

From c9abc8935c30fd094328c0824e73a62c81f01415 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Sun, 13 Oct 2024 20:57:36 -0300
Subject: [PATCH 04/27] More install

---
 docker/ckan/Dockerfile                       |  6 ++++++
 docker/ckan/files/scripts/install-ckan.sh    |  9 ++++----
 docker/ckan/files/scripts/install-os-deps.sh | 22 +++-----------------
 docker/ckan/files/scripts/install-python.sh  | 20 ++++++++++++++++++
 4 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100755 docker/ckan/files/scripts/install-python.sh

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 844c8a1..b1841e3 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -17,8 +17,14 @@ COPY files ${APP_DIR}/files
 RUN ${APP_DIR}/files/scripts/build-env-vars.sh
 
 # Install OS dependencies
+RUN ${APP_DIR}/files/scripts/install-python.sh
 RUN ${APP_DIR}/files/scripts/install-os-deps.sh
 
+# Create the ckan user
+RUN useradd -m -s /bin/bash ckan
+RUN chown ckan -R ${APP_DIR}
+USER ckan
+
 # Install CKAN
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
 
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
index 80f0433..1c17cef 100755
--- a/docker/ckan/files/scripts/install-ckan.sh
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-echo "Installing CKAN ..."
+echo "Installing CKAN $CKAN_GIT_BRANCH :: $CKAN_GIT_URL"
 
 
 # load env vars from ${APP_DIR}/.env
@@ -15,9 +15,10 @@ source ${APP_DIR}/venv/bin/activate
 echo "Creating CKAN storage directory: $CKAN_STORAGE_FOLDER"
 mkdir -p ${APP_DIR}/${CKAN_STORAGE_FOLDER}
 
-echo "------ Checking out upstream CKAN: $GIT_BRANCH ------"
-cd ${SRC_DIR}
-git clone -b "$GIT_BRANCH" https://github.com/ckan/ckan.git ckan
+# Create a source folder
+mkdir src
+cd src
+git clone -b "$CKAN_GIT_BRANCH" $CKAN_GIT_URL ckan
 cd ckan
 
 echo "------ Installing requirements ------"
diff --git a/docker/ckan/files/scripts/install-os-deps.sh b/docker/ckan/files/scripts/install-os-deps.sh
index 9b20665..6a54561 100755
--- a/docker/ckan/files/scripts/install-os-deps.sh
+++ b/docker/ckan/files/scripts/install-os-deps.sh
@@ -2,22 +2,6 @@
 
 echo "Installing OS dependencies"
 
-# load env vars from ${APP_DIR}/.env
-set -o allexport
-. ${APP_DIR}/.env
-set +o allexport
-
-apt update
-
-# Install Python according to PY_VERSION
-apt install -y software-properties-common wget gnupg
-
-# Add deadsnakes PPA manually
-wget -qO - https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6A755776 | gpg --dearmor -o /usr/share/keyrings/deadsnakes-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/deadsnakes-archive-keyring.gpg] http://ppa.launchpad.net/deadsnakes/ppa/ubuntu focal main" > /etc/apt/sources.list.d/deadsnakes-ppa.list
-apt install -y python${PY_VERSION} python${PY_VERSION}-dev python3-pip python3-venv
-
-# Define python alias for the version installed
-ln -s /usr/bin/python${PY_VERSION} /usr/bin/python
-
-echo "Python installed $(python --version)"
+# =====================================================
+# Install more dependencies
+apt install -y git
diff --git a/docker/ckan/files/scripts/install-python.sh b/docker/ckan/files/scripts/install-python.sh
new file mode 100755
index 0000000..5bc4cbd
--- /dev/null
+++ b/docker/ckan/files/scripts/install-python.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+echo "Installing OS dependencies"
+
+# load env vars from ${APP_DIR}/.env
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+apt update
+
+# =====================================================
+# Install Python3 with the default version
+apt install -y python3 python3-dev python3-pip python3-venv
+echo "Python3 installed $(which python3)"
+
+# Define python alias for the version installed
+ln -s /usr/bin/python3 /usr/bin/python
+
+echo "Python installed $(python --version)"

From 2e14a9cd9a534da4fc3f607c2c1a62e9857a15b9 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Sun, 13 Oct 2024 21:15:24 -0300
Subject: [PATCH 05/27] More

---
 docker/ckan/Dockerfile                       |  9 +-------
 docker/ckan/files/scripts/entrypoint.sh      | 23 ++++++++++++--------
 docker/ckan/files/scripts/install-ckan.sh    | 18 +++++++--------
 docker/ckan/files/scripts/install-os-deps.sh |  5 ++++-
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index b1841e3..36c4ae0 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -28,15 +28,8 @@ USER ckan
 # Install CKAN
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
 
-# Create the ckan user
-RUN useradd -m -s /bin/bash ckan
-
-RUN chown ckan -R ${APP_DIR}
-
-EXPOSE 5000
-
 HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 
-EXPOSE 5000 2222
+EXPOSE 5000
 
 ENTRYPOINT [ "./files/scripts/entrypoint.sh" ]
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index 5297616..bd6b35d 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -1,16 +1,15 @@
 #!/bin/bash -e
-echo "Executing entrypoint.sh for $ENV_NAME environment"
-# infinite loop
-while true;
-do
-    echo "Waiting for database to be ready..."
-    sleep 3
-done
 
-if [ "$ENV_NAME" = "local" ] ; then
+# load env vars from ${APP_DIR}/.env
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+echo "Executing entrypoint.sh"
+
+if [ "$IS_DEV_ENV" = "true" ] ; then
     # If we are in the local environment, install the local extensions
     PREPARE_SCRIPT=$APP_DIR/files/scripts/prepare-local-dev-extensions.sh
-    chmod u+x $PREPARE_SCRIPT
     $PREPARE_SCRIPT
 fi
 
@@ -19,6 +18,12 @@ if [ -z "$SQLALCHEMY_URL" ]; then
   exit 1
 fi
 
+while true;
+do
+    echo "Waiting to be ready..."
+    sleep 3
+done
+
 # Wait for the database to be ready
 until psql -d $SQLALCHEMY_URL -c '\q'; do
   echo "Postgres is unavailable - sleeping"
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
index 1c17cef..e3b7980 100755
--- a/docker/ckan/files/scripts/install-ckan.sh
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -1,14 +1,12 @@
 #!/bin/bash -e
 
-echo "Installing CKAN $CKAN_GIT_BRANCH :: $CKAN_GIT_URL"
-
-
 # load env vars from ${APP_DIR}/.env
 set -o allexport
 . ${APP_DIR}/.env
 set +o allexport
 
-echo "Setup python env for python ver $(python3 --version)"
+echo "Installing CKAN $CKAN_GIT_BRANCH :: $CKAN_GIT_URL :: $(python3 --version)"
+
 python3 -m venv ${APP_DIR}/venv
 source ${APP_DIR}/venv/bin/activate
 
@@ -21,17 +19,20 @@ cd src
 git clone -b "$CKAN_GIT_BRANCH" $CKAN_GIT_URL ckan
 cd ckan
 
-echo "------ Installing requirements ------"
+echo "Installing requirements"
 pip install -r requirements.txt
 
 # The boolean IS_DEV_ENV define if we need to install dev requirements
 if [ "$IS_DEV_ENV" = "true" ] ; then
-  echo "------ Installing dev requirements ------"
+  echo "Installing dev requirements"
   pip install -r dev-requirements.txt
   pip install flask-debugtoolbar
 fi
 
-echo "------ Patch CKAN if required ------"
+echo "Installing CKAN package"
+pip install .
+
+echo "Patch CKAN if required"
 cd ${APP_DIR}
 
 PATCH_FOLDER=$APP_DIR/files/patches
@@ -45,7 +46,4 @@ for dir in ${PATCH_FOLDER}/*; do \
     done ; \
 done
 
-echo "Installing CKAN package"
-pip install .
-
 echo "CKAN installed"
diff --git a/docker/ckan/files/scripts/install-os-deps.sh b/docker/ckan/files/scripts/install-os-deps.sh
index 6a54561..484b758 100755
--- a/docker/ckan/files/scripts/install-os-deps.sh
+++ b/docker/ckan/files/scripts/install-os-deps.sh
@@ -4,4 +4,7 @@ echo "Installing OS dependencies"
 
 # =====================================================
 # Install more dependencies
-apt install -y git
+apt install -y git libpq-dev
+
+# git: to pull the CKAN source code from GitHub
+# libpq-dev: for PostgreSQL support in CKAN (psycopg2)

From cd6e71613e9376862e9aa8d18cf348e0c8c8255d Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Sun, 13 Oct 2024 21:49:30 -0300
Subject: [PATCH 06/27] Clean

---
 docker/Makefile                               |  18 +-
 docker/ckan/Dockerfile                        |   3 +-
 docker/ckan/files/scripts/entrypoint.sh       |   2 +-
 docker/docker-compose.sample.yml              |   2 +-
 docker/postgresql/Dockerfile                  |  13 -
 .../10_create_datastore.sql                   |   4 -
 .../20_setup_test_databases.sql               |   2 -
 docker/solr/Dockerfile                        |   1 -
 docker/solr/solrconfig.xml                    | 343 ------------------
 9 files changed, 13 insertions(+), 375 deletions(-)
 delete mode 100644 docker/postgresql/Dockerfile
 delete mode 100644 docker/postgresql/docker-entrypoint-initdb.d/10_create_datastore.sql
 delete mode 100644 docker/postgresql/docker-entrypoint-initdb.d/20_setup_test_databases.sql
 delete mode 100644 docker/solr/Dockerfile
 delete mode 100644 docker/solr/solrconfig.xml

diff --git a/docker/Makefile b/docker/Makefile
index 3b00673..82dc663 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -9,24 +9,24 @@ build:
 		--build-arg ENV_NAME=${ENV_NAME} \
 		--build-arg TZ=${TZ} \
 		-t unckan:${ENV_NAME} ckan
-	# docker compose build
+	echo "Build done unckan:${ENV_NAME}"
 
 down:
-	docker-compose down
+	docker compose down
 
 clean:
-	docker-compose down -v --remove-orphans
+	docker compose down -v --remove-orphans
 
 debug:
-	docker-compose build
-	docker-compose run --service-ports ckan
+	docker compose build
+	docker compose run --service-ports ckan
 
 up:
-	docker-compose up
+	docker compose up
 
 build-up:
-	docker-compose build
-	docker-compose up
+	docker compose build
+	docker compose up
 
 ckan-worker:
-	docker-compose exec ckan ckan jobs worker
+	docker compose exec ckan ckan jobs worker
diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 36c4ae0..8e67c2e 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -32,4 +32,5 @@ HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://local
 
 EXPOSE 5000
 
-ENTRYPOINT [ "./files/scripts/entrypoint.sh" ]
+COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
+ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index bd6b35d..b79ecf6 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -5,7 +5,7 @@ set -o allexport
 . ${APP_DIR}/.env
 set +o allexport
 
-echo "Executing entrypoint.sh"
+echo "Executing entrypoint.sh ($IS_DEV_ENV)"
 
 if [ "$IS_DEV_ENV" = "true" ] ; then
     # If we are in the local environment, install the local extensions
diff --git a/docker/docker-compose.sample.yml b/docker/docker-compose.sample.yml
index 89721dc..41e0f77 100644
--- a/docker/docker-compose.sample.yml
+++ b/docker/docker-compose.sample.yml
@@ -8,7 +8,7 @@ services:
       - solr
       - redis
     ports:
-      - "0.0.0.0:${CKAN_PORT}:5000"
+      - "0.0.0.0:5000:5000"
     volumes:
       - ./src:/srv/app/src_extensions
       - ckan_storage:/var/lib/ckan
diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile
deleted file mode 100644
index 42ea06f..0000000
--- a/docker/postgresql/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM postgres:15-alpine
-
-# Allow connections; we don't map out any ports so only linked docker containers can connect
-RUN echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf
-
-# Customize default user/pass/db
-ENV POSTGRES_DB ckan
-ENV POSTGRES_USER ckan
-ARG POSTGRES_PASSWORD
-ARG DATASTORE_READONLY_PASSWORD
-
-# Include extra setup scripts (eg datastore)
-ADD docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
diff --git a/docker/postgresql/docker-entrypoint-initdb.d/10_create_datastore.sql b/docker/postgresql/docker-entrypoint-initdb.d/10_create_datastore.sql
deleted file mode 100644
index 8038de0..0000000
--- a/docker/postgresql/docker-entrypoint-initdb.d/10_create_datastore.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-\set datastore_ro_password '\'' `echo $DATASTORE_READONLY_PASSWORD` '\''
-
-CREATE ROLE datastore_ro NOSUPERUSER NOCREATEDB NOCREATEROLE LOGIN PASSWORD :datastore_ro_password;
-CREATE DATABASE datastore OWNER ckan ENCODING 'utf-8';
diff --git a/docker/postgresql/docker-entrypoint-initdb.d/20_setup_test_databases.sql b/docker/postgresql/docker-entrypoint-initdb.d/20_setup_test_databases.sql
deleted file mode 100644
index 140f2e5..0000000
--- a/docker/postgresql/docker-entrypoint-initdb.d/20_setup_test_databases.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE DATABASE ckan_test OWNER ckan ENCODING 'utf-8';
-CREATE DATABASE datastore_test OWNER ckan ENCODING 'utf-8';
diff --git a/docker/solr/Dockerfile b/docker/solr/Dockerfile
deleted file mode 100644
index dacabb8..0000000
--- a/docker/solr/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-FROM ckan/ckan-solr:2.9-solr8
diff --git a/docker/solr/solrconfig.xml b/docker/solr/solrconfig.xml
deleted file mode 100644
index 9ac620c..0000000
--- a/docker/solr/solrconfig.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--solrconfig.xml documentation [https://wiki.apache.org/solr/SolrConfigXml]-->
-<config>
- 
-	<luceneMatchVersion>6.0.0</luceneMatchVersion>
-	
-	<lib dir="${solr.install.dir:../../../..}/contrib/extraction/lib" regex=".*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-cell-\d.*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/contrib/clustering/lib/" regex=".*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-clustering-\d.*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/contrib/langid/lib/" regex=".*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-langid-\d.*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/contrib/velocity/lib" regex=".*\.jar" />
-	<lib dir="${solr.install.dir:../../../..}/dist/" regex="solr-velocity-\d.*\.jar" />
-	
-	<dataDir>${solr.data.dir:}</dataDir>
-	
-	<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}" />
-	
-	<codecFactory class="solr.SchemaCodecFactory" />
-	
-	<indexConfig>
-		<lockType>${solr.lock.type:native}</lockType>
-	</indexConfig>
-	
-	<jmx />
-	
-	<updateHandler class="solr.DirectUpdateHandler2">
-	 
-		<updateLog>
-			<str name="dir">${solr.ulog.dir:}</str>
-			<int name="numVersionBuckets">${solr.ulog.numVersionBuckets:65536}</int>
-		</updateLog>
-		
-		<autoCommit>
-			<maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
-			<openSearcher>false</openSearcher>
-		</autoCommit>
-		
-		<autoSoftCommit>
-			<maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
-		</autoSoftCommit>
-		
-	</updateHandler>
-	
-	<query>
-	 
-		<maxBooleanClauses>1024</maxBooleanClauses>
-		<filterCache class="solr.FastLRUCache" size="512" initialSize="512" autowarmCount="0" />
-		<queryResultCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0" />
-		<documentCache class="solr.LRUCache" size="512" initialSize="512" autowarmCount="0" />
-		<cache name="perSegFilter" class="solr.search.LRUCache" size="10" initialSize="0" autowarmCount="10" regenerator="solr.NoOpRegenerator" />
-		<enableLazyFieldLoading>true</enableLazyFieldLoading>
-		<queryResultWindowSize>20</queryResultWindowSize>
-		<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-		
-		<listener event="newSearcher" class="solr.QuerySenderListener">
-			<arr name="queries" />
-		</listener>
-		
-		<listener event="firstSearcher" class="solr.QuerySenderListener">
-			<arr name="queries" />
-		</listener>
-		
-		<useColdSearcher>false</useColdSearcher>
-		<maxWarmingSearchers>2</maxWarmingSearchers>
-		
-	</query>
-	
-	<requestDispatcher handleSelect="false">
-	 
-		<requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048000" formdataUploadLimitInKB="2048" addHttpRequestToContext="false" />
-		<httpCaching never304="true" />
-		
-	</requestDispatcher>
-	
-	<requestHandler name="/select" class="solr.SearchHandler">
-	 
-		<lst name="defaults">
-			<str name="echoParams">explicit</str>
-			<int name="rows">10</int>
-		</lst>
-		
-	</requestHandler>
-	
-	<requestHandler name="/query" class="solr.SearchHandler">
-	 
-		<lst name="defaults">
-			<str name="echoParams">explicit</str>
-			<str name="wt">json</str>
-			<str name="indent">true</str>
-		</lst>
-		
-	</requestHandler>
-	
-	<requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse">
-	 
-		<lst name="defaults">
-			<str name="echoParams">explicit</str>
-		</lst>
-		
-	</requestHandler>
-	
-	<initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
-	 
-		<lst name="defaults">
-			<str name="df">_text_</str>
-		</lst>
-		
-	</initParams>
-	
-	<initParams path="/update/**">
-	 
-		<lst name="defaults">
-			<str name="update.chain">add-unknown-fields-to-the-schema</str>
-		</lst>
-		
-	</initParams>
-	
-	<requestHandler name="/update/extract" startup="lazy" class="solr.extraction.ExtractingRequestHandler">
-	 
-		<lst name="defaults">
-			<str name="lowernames">true</str>
-			<str name="fmap.meta">ignored_</str>
-			<str name="fmap.content">_text_</str>
-		</lst>
-		
-	</requestHandler>
-	
-	<requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
-	<requestHandler name="/analysis/document" class="solr.DocumentAnalysisRequestHandler" startup="lazy" />
-	
-	<requestHandler name="/debug/dump" class="solr.DumpRequestHandler">
-	 
-		<lst name="defaults">
-			<str name="echoParams">explicit</str>
-			<str name="echoHandler">true</str>
-		</lst>
-		
-	</requestHandler>
-	
-	<searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-	 
-		<str name="queryAnalyzerFieldType">text_general</str>
-		
-		<lst name="spellchecker">
-			<str name="name">default</str>
-			<str name="field">_text_</str>
-			<str name="classname">solr.DirectSolrSpellChecker</str>
-			<str name="distanceMeasure">internal</str>
-			<float name="accuracy">0.5</float>
-			<int name="maxEdits">2</int>
-			<int name="minPrefix">1</int>
-			<int name="maxInspections">5</int>
-			<int name="minQueryLength">4</int>
-			<float name="maxQueryFrequency">0.01</float>
-		</lst>
-		
-	</searchComponent>
-	
-	<requestHandler name="/spell" class="solr.SearchHandler" startup="lazy">
-	 
-		<lst name="defaults">
-			<str name="spellcheck.dictionary">default</str>
-			<str name="spellcheck">on</str>
-			<str name="spellcheck.extendedResults">true</str>
-			<str name="spellcheck.count">10</str>
-			<str name="spellcheck.alternativeTermCount">5</str>
-			<str name="spellcheck.maxResultsForSuggest">5</str>
-			<str name="spellcheck.collate">true</str>
-			<str name="spellcheck.collateExtendedResults">true</str>
-			<str name="spellcheck.maxCollationTries">10</str>
-			<str name="spellcheck.maxCollations">5</str>
-		</lst>
-		
-		<arr name="last-components">
-			<str>spellcheck</str>
-		</arr>
-		
-	</requestHandler>
-	
-	<searchComponent name="tvComponent" class="solr.TermVectorComponent" />
-	
-	<requestHandler name="/tvrh" class="solr.SearchHandler" startup="lazy">
-	 
-		<lst name="defaults">
-			<bool name="tv">true</bool>
-		</lst>
-		<arr name="last-components">
-			<str>tvComponent</str>
-		</arr>
-		
-	</requestHandler>
-	
-	<searchComponent name="terms" class="solr.TermsComponent" />
-	
-	<requestHandler name="/terms" class="solr.SearchHandler" startup="lazy">
-	 
-		<lst name="defaults">
-			<bool name="terms">true</bool>
-			<bool name="distrib">false</bool>
-		</lst>
-		
-		<arr name="components">
-			<str>terms</str>
-		</arr>
-		
-	</requestHandler>
-	
-	<searchComponent name="elevator" class="solr.QueryElevationComponent">
-	 
-		<str name="queryFieldType">string</str>
-		<str name="config-file">elevate.xml</str>
-		
-	</searchComponent>
-	
-	<requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-	 
-		<lst name="defaults">
-			<str name="echoParams">explicit</str>
-		</lst>
-		<arr name="last-components">
-			<str>elevator</str>
-		</arr>
-		
-	</requestHandler>
-	
-	<searchComponent class="solr.HighlightComponent" name="highlight">
-	 
-		<highlighting>
-		 
-			<fragmenter name="gap" default="true" class="solr.highlight.GapFragmenter">
-				<lst name="defaults">
-					<int name="hl.fragsize">100</int>
-				</lst>
-			</fragmenter>
-			
-			<fragmenter name="regex" class="solr.highlight.RegexFragmenter">
-				<lst name="defaults">
-					<int name="hl.fragsize">70</int>
-					<float name="hl.regex.slop">0.5</float>
-					<str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str>
-				</lst>
-			</fragmenter>
-			
-			<formatter name="html" default="true" class="solr.highlight.HtmlFormatter">
-				<lst name="defaults">
-					<str name="hl.simple.pre"><![CDATA[<em>]]></str>
-					<str name="hl.simple.post"><![CDATA[</em>]]></str>
-				</lst>
-			</formatter>
-			
-			<encoder name="html" class="solr.highlight.HtmlEncoder" />
-			<fragListBuilder name="simple" class="solr.highlight.SimpleFragListBuilder" />
-			<fragListBuilder name="single" class="solr.highlight.SingleFragListBuilder" />
-			<fragListBuilder name="weighted" default="true" class="solr.highlight.WeightedFragListBuilder" />
-			<fragmentsBuilder name="default" default="true" class="solr.highlight.ScoreOrderFragmentsBuilder" />
-			<fragmentsBuilder name="colored" class="solr.highlight.ScoreOrderFragmentsBuilder">
-			 
-				<lst name="defaults">
-					<str name="hl.tag.pre"><![CDATA[<b style="background:yellow">,<b style="background:lawgreen">,
-               <b style="background:aquamarine">,<b style="background:magenta">,
-               <b style="background:palegreen">,<b style="background:coral">,
-               <b style="background:wheat">,<b style="background:khaki">,
-               <b style="background:lime">,<b style="background:deepskyblue">]]></str>
-					<str name="hl.tag.post"><![CDATA[</b>]]></str>
-				</lst>
-				
-			</fragmentsBuilder>
-			
-			<boundaryScanner name="default" default="true" class="solr.highlight.SimpleBoundaryScanner">
-				<lst name="defaults">
-					<str name="hl.bs.maxScan">10</str>
-					<str name="hl.bs.chars">.,!?</str>
-				</lst>
-			</boundaryScanner>
-			
-			<boundaryScanner name="breakIterator" class="solr.highlight.BreakIteratorBoundaryScanner">
-				<lst name="defaults">
-					<str name="hl.bs.type">WORD</str>
-					<str name="hl.bs.language">en</str>
-					<str name="hl.bs.country">US</str>
-				</lst>
-			</boundaryScanner>
-			
-		</highlighting>
-		
-	</searchComponent>
-	
-	<schemaFactory class="ClassicIndexSchemaFactory" />
-	
-	<updateRequestProcessorChain name="add-unknown-fields-to-the-schema">
-		<processor class="solr.UUIDUpdateProcessorFactory" />
-		<processor class="solr.LogUpdateProcessorFactory" />
-		<processor class="solr.DistributedUpdateProcessorFactory" />
-		<processor class="solr.RemoveBlankFieldUpdateProcessorFactory" />
-		<processor class="solr.FieldNameMutatingUpdateProcessorFactory">
-			<str name="pattern">[^\w-\.]</str>
-			<str name="replacement">_</str>
-		</processor>
-		<processor class="solr.ParseBooleanFieldUpdateProcessorFactory" />
-		<processor class="solr.ParseLongFieldUpdateProcessorFactory" />
-		<processor class="solr.ParseDoubleFieldUpdateProcessorFactory" />
-		<processor class="solr.ParseDateFieldUpdateProcessorFactory">
-			<arr name="format">
-				<str>yyyy-MM-dd'T'HH:mm:ss.SSSZ</str>
-				<str>yyyy-MM-dd'T'HH:mm:ss,SSSZ</str>
-				<str>yyyy-MM-dd'T'HH:mm:ss.SSS</str>
-				<str>yyyy-MM-dd'T'HH:mm:ss,SSS</str>
-				<str>yyyy-MM-dd'T'HH:mm:ssZ</str>
-				<str>yyyy-MM-dd'T'HH:mm:ss</str>
-				<str>yyyy-MM-dd'T'HH:mmZ</str>
-				<str>yyyy-MM-dd'T'HH:mm</str>
-				<str>yyyy-MM-dd HH:mm:ss.SSSZ</str>
-				<str>yyyy-MM-dd HH:mm:ss,SSSZ</str>
-				<str>yyyy-MM-dd HH:mm:ss.SSS</str>
-				<str>yyyy-MM-dd HH:mm:ss,SSS</str>
-				<str>yyyy-MM-dd HH:mm:ssZ</str>
-				<str>yyyy-MM-dd HH:mm:ss</str>
-				<str>yyyy-MM-dd HH:mmZ</str>
-				<str>yyyy-MM-dd HH:mm</str>
-				<str>yyyy-MM-dd</str>
-			</arr>
-		</processor>
-		<processor class="solr.RunUpdateProcessorFactory" />
-	</updateRequestProcessorChain>
-	
-	<queryResponseWriter name="json" class="solr.JSONResponseWriter">
-		<str name="content-type">text/plain; charset=UTF-8</str>
-	</queryResponseWriter>
-	
-	<queryResponseWriter name="velocity" class="solr.VelocityResponseWriter" startup="lazy">
-		<str name="template.base.dir">${velocity.template.base.dir:}</str>
-		<str name="solr.resource.loader.enabled">${velocity.solr.resource.loader.enabled:true}</str>
-		<str name="params.resource.loader.enabled">${velocity.params.resource.loader.enabled:false}</str>
-	</queryResponseWriter>
-	
-	<queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">
-		<int name="xsltCacheLifetimeSeconds">5</int>
-	</queryResponseWriter>
-	
-</config>

From 7013a7566dcb7a5a284ef74d94da55d72ca303d3 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Sun, 13 Oct 2024 23:56:15 -0300
Subject: [PATCH 07/27] preparing DB

---
 docker/ckan/Dockerfile                        |  8 +++---
 docker/ckan/files/env/base.env                | 11 +++++++-
 docker/ckan/files/env/prod.env                |  1 +
 docker/ckan/files/scripts/entrypoint.sh       | 28 ++++---------------
 docker/ckan/files/scripts/install-os-deps.sh  |  3 +-
 docker/ckan/files/scripts/install-python.sh   |  9 +-----
 .../scripts/prepare-local-dev-extensions.sh   |  6 ----
 7 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 8e67c2e..62632df 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -9,7 +9,7 @@ ENV APP_DIR=/app/unckan
 ENV CKAN_INI=${APP_DIR}/ckan.ini
 
 WORKDIR ${APP_DIR}
-# RUN mkdir -p ${APP_DIR}
+RUN apt update
 
 COPY files ${APP_DIR}/files
 
@@ -28,9 +28,9 @@ USER ckan
 # Install CKAN
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
 
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
+COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
 
+HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 EXPOSE 5000
 
-COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
-ENTRYPOINT [ "./entrypoint.sh" ]
+ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
diff --git a/docker/ckan/files/env/base.env b/docker/ckan/files/env/base.env
index ab68efa..d7d4369 100644
--- a/docker/ckan/files/env/base.env
+++ b/docker/ckan/files/env/base.env
@@ -4,7 +4,6 @@
 CKAN_UNI_VERSION=0.2.0
 CKAN_GIT_URL=https://github.com/ckan/ckan.git
 CKAN_GIT_BRANCH=ckan-2.10.5
-PY_VERSION=3.11
 
 # A folder for storing uploaded (and other) files in $APP_DIR
 CKAN_STORAGE_FOLDER=storage
@@ -12,3 +11,13 @@ CKAN_STORAGE_FOLDER=storage
 # Define if this env is for development
 # This will load dev requirements and prepare the app for development
 IS_DEV_ENV=true
+
+CKAN_SITE_URL=https://localhost:5000
+CKAN_DEBUG=true
+# https://github.com/ckan/ckan-postgres-dev/blob/main/Dockerfile
+SQLALCHEMY_URL=postgresql://ckan_default:pass@postgresql_uni/ckan_test
+SOLR_URL=http://solr_nrc:8983/solr/ckan
+CKAN_REDIS_URL=redis://redis_nrc:6379/0
+SECRET_KEY=flask-secret-key
+BEAKER_SESSION_SECRET=some-secret
+BEAKER_SESSION_VALIDATE_KEY=other-key
diff --git a/docker/ckan/files/env/prod.env b/docker/ckan/files/env/prod.env
index e97254f..09f4b8e 100644
--- a/docker/ckan/files/env/prod.env
+++ b/docker/ckan/files/env/prod.env
@@ -1 +1,2 @@
 IS_DEV_ENV=false
+CKAN_DEBUG=false
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index b79ecf6..6f7f55e 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -13,34 +13,19 @@ if [ "$IS_DEV_ENV" = "true" ] ; then
     $PREPARE_SCRIPT
 fi
 
-if [ -z "$SQLALCHEMY_URL" ]; then
-  echo "SQLALCHEMY_URL is not set. Exiting."
-  exit 1
-fi
-
-while true;
-do
-    echo "Waiting to be ready..."
-    sleep 3
-done
-
+# The CKAN PostgreSQL image creates the database and user
+# https://github.com/ckan/ckan-postgres-dev/blob/main/Dockerfile
 # Wait for the database to be ready
+
 until psql -d $SQLALCHEMY_URL -c '\q'; do
-  echo "Postgres is unavailable - sleeping"
+  echo "Postgres is unavailable - sleeping. Response: $?"
   sleep 3
 done
 
-echo "Postgres is up - executing command"
-
-# Initialize Datastore
-./scripts/setup-datastore.sh
+echo "Postgres is up, continue"
 
 echo "CKAN DB init"
 ckan db init
-echo "Applying migrations for announcements"
-ckan db upgrade -p announcements
-echo "Applying migrations for uni"
-ckan db upgrade -p uni
 
 # Rebuild search index
 ckan search-index rebuild
@@ -51,9 +36,6 @@ DATAPUSHER_TOKEN=$(ckan user token add default datapusher_multi expires_in=365 u
 ckan config-tool ckan.ini "ckan.datapusher.api_token=${DATAPUSHER_TOKEN}"
 ckan config-tool ckan.ini "ckanext.datapusher_plus.api_token=${DATAPUSHER_TOKEN}"
 
-# Start ssh service to connect to Azure
-service ssh start
-
 # Start supervisor to run CKAN workers (Datapusher+)
 echo "Starting supervisor"
 service supervisor start
diff --git a/docker/ckan/files/scripts/install-os-deps.sh b/docker/ckan/files/scripts/install-os-deps.sh
index 484b758..f25e0bd 100755
--- a/docker/ckan/files/scripts/install-os-deps.sh
+++ b/docker/ckan/files/scripts/install-os-deps.sh
@@ -4,7 +4,8 @@ echo "Installing OS dependencies"
 
 # =====================================================
 # Install more dependencies
-apt install -y git libpq-dev
+apt install -y git libpq-dev postgresql-client
 
 # git: to pull the CKAN source code from GitHub
 # libpq-dev: for PostgreSQL support in CKAN (psycopg2)
+# postgresql-client: for the psql command-line tool
diff --git a/docker/ckan/files/scripts/install-python.sh b/docker/ckan/files/scripts/install-python.sh
index 5bc4cbd..acee199 100755
--- a/docker/ckan/files/scripts/install-python.sh
+++ b/docker/ckan/files/scripts/install-python.sh
@@ -1,13 +1,6 @@
 #!/bin/bash -e
 
-echo "Installing OS dependencies"
-
-# load env vars from ${APP_DIR}/.env
-set -o allexport
-. ${APP_DIR}/.env
-set +o allexport
-
-apt update
+echo "Installing Python"
 
 # =====================================================
 # Install Python3 with the default version
diff --git a/docker/ckan/files/scripts/prepare-local-dev-extensions.sh b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
index 1e6787d..3897fd2 100755
--- a/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
+++ b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# Only run this script in the dev environment
-if [ "$ENV_NAME" != "dev" ]; then
-    echo "ENV_NAME is not 'dev'. Exiting."
-    exit 0
-fi
-
 # From ckan docker base
 # https://github.com/ckan/ckan-docker-base/blob/main/ckan-2.10/dev/setup/start_ckan_development.sh#L9-L48
 # All CKAN extensions in this folder will be installed in the CKAN development environment

From e425fa6cda6b75e5c31d73d28fdb57fa550c7e7e Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 00:19:33 -0300
Subject: [PATCH 08/27] preparing ckan

---
 docker/ckan/Dockerfile                        |  2 ++
 docker/ckan/files/etc/ckan-dev.conf           | 12 +++++++
 docker/ckan/files/etc/ckan-worker.conf        |  5 ++-
 docker/ckan/files/scripts/entrypoint.sh       | 33 ++++---------------
 docker/ckan/files/scripts/install-ckan.sh     |  5 +--
 docker/ckan/files/scripts/install-os-deps.sh  |  5 ++-
 .../ckan/files/scripts/prepare-supervisor.sh  |  8 +++++
 7 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 docker/ckan/files/etc/ckan-dev.conf
 create mode 100755 docker/ckan/files/scripts/prepare-supervisor.sh

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 62632df..b861f99 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -19,6 +19,7 @@ RUN ${APP_DIR}/files/scripts/build-env-vars.sh
 # Install OS dependencies
 RUN ${APP_DIR}/files/scripts/install-python.sh
 RUN ${APP_DIR}/files/scripts/install-os-deps.sh
+RUN ${APP_DIR}/files/scripts/prepare-supervisor.sh
 
 # Create the ckan user
 RUN useradd -m -s /bin/bash ckan
@@ -26,6 +27,7 @@ RUN chown ckan -R ${APP_DIR}
 USER ckan
 
 # Install CKAN
+RUN mv ${APP_DIR}/files/ckan.ini ${CKAN_INI}
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
 
 COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
diff --git a/docker/ckan/files/etc/ckan-dev.conf b/docker/ckan/files/etc/ckan-dev.conf
new file mode 100644
index 0000000..1f1d462
--- /dev/null
+++ b/docker/ckan/files/etc/ckan-dev.conf
@@ -0,0 +1,12 @@
+[program:ckan-worker]
+command=${APP_DIR}/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+user=ckan
+environment=HOME="${APP_DIR}",USER="ckan"
+
diff --git a/docker/ckan/files/etc/ckan-worker.conf b/docker/ckan/files/etc/ckan-worker.conf
index f6fc174..7b4a819 100644
--- a/docker/ckan/files/etc/ckan-worker.conf
+++ b/docker/ckan/files/etc/ckan-worker.conf
@@ -1,5 +1,5 @@
 [program:ckan-worker]
-command=ckan -c /srv/app/ckan.ini jobs worker 
+command=ckan -c $CKAN_INI jobs worker 
 priority=501
 autostart=true
 autorestart=true
@@ -9,5 +9,4 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 user=ckan
-environment=HOME="/srv/app",USER="ckan"
-
+environment=HOME="${APP_DIR}",USER="ckan"
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index 6f7f55e..f7a684c 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -24,6 +24,8 @@ done
 
 echo "Postgres is up, continue"
 
+source ${APP_DIR}/venv/bin/activate
+
 echo "CKAN DB init"
 ckan db init
 
@@ -36,40 +38,19 @@ DATAPUSHER_TOKEN=$(ckan user token add default datapusher_multi expires_in=365 u
 ckan config-tool ckan.ini "ckan.datapusher.api_token=${DATAPUSHER_TOKEN}"
 ckan config-tool ckan.ini "ckanext.datapusher_plus.api_token=${DATAPUSHER_TOKEN}"
 
-# Start supervisor to run CKAN workers (Datapusher+)
-echo "Starting supervisor"
-service supervisor start
-
-# Ensure storage directory with ckan permission (exclude venv which is huge)
-chown -R ckan:ckan $APP_DIR/storage
-
 # Rebuild webassets in can they were patched
 ckan asset build
 
-# If exists, fix $APP_DIR/webassets for local
-if [ -d "$APP_DIR/webassets" ]; then
-    chown -R ckan:ckan $APP_DIR/webassets
-fi
-
-echo "Validating yacron"
-# Validate yacron file
-yacron -c /etc/yacron.d/yacrontab.yaml --validate
-
-echo "Starting yacron"
-# Start yacron in the background
-yacron -c /etc/yacron.d/yacrontab.yaml &
-
 # Execute gunicorn pointing to CKAN's wsgi application
 echo "Starting gunicorn"
-GUNICORN=$APP_DIR/venv/bin/gunicorn
+GUNICORN=${APP_DIR}/venv/bin//gunicorn
+
 
 # Start the development server as the ckan user with automatic reload
-if [ "$ENV_NAME" = "local" ] ; then
-    CERT=$APP_DIR/files/cert/localhost.cert
-    KEY=$APP_DIR/files/cert/localhost.key
-    su - ckan -c "$GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$CERT --keyfile=$KEY --reload wsgi:application"
+if [ "$IS_DEV_ENV" = "true" ] ; then
+    supervisorctl start ckan-dev
 else
-    su - ckan -c "$GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
+    $GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360
 fi
 
 echo "Finished entrypoint.sh"
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
index e3b7980..d48285d 100755
--- a/docker/ckan/files/scripts/install-ckan.sh
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -5,10 +5,11 @@ set -o allexport
 . ${APP_DIR}/.env
 set +o allexport
 
-echo "Installing CKAN $CKAN_GIT_BRANCH :: $CKAN_GIT_URL :: $(python3 --version)"
+echo "Installing CKAN $CKAN_GIT_BRANCH :: $CKAN_GIT_URL :: $(python --version)"
 
-python3 -m venv ${APP_DIR}/venv
+python -m venv ${APP_DIR}/venv
 source ${APP_DIR}/venv/bin/activate
+pip install gunicorn
 
 echo "Creating CKAN storage directory: $CKAN_STORAGE_FOLDER"
 mkdir -p ${APP_DIR}/${CKAN_STORAGE_FOLDER}
diff --git a/docker/ckan/files/scripts/install-os-deps.sh b/docker/ckan/files/scripts/install-os-deps.sh
index f25e0bd..3f5d878 100755
--- a/docker/ckan/files/scripts/install-os-deps.sh
+++ b/docker/ckan/files/scripts/install-os-deps.sh
@@ -4,8 +4,11 @@ echo "Installing OS dependencies"
 
 # =====================================================
 # Install more dependencies
-apt install -y git libpq-dev postgresql-client
+apt install -y gettext-base git libmagic1 libpq-dev postgresql-client supervisor
 
 # git: to pull the CKAN source code from GitHub
+# libmagic1: for the file upload functionality in CKAN
 # libpq-dev: for PostgreSQL support in CKAN (psycopg2)
 # postgresql-client: for the psql command-line tool
+# supervisor: to run CKAN jobs in the background
+# gettext-base: for envsubst command
diff --git a/docker/ckan/files/scripts/prepare-supervisor.sh b/docker/ckan/files/scripts/prepare-supervisor.sh
new file mode 100755
index 0000000..5579328
--- /dev/null
+++ b/docker/ckan/files/scripts/prepare-supervisor.sh
@@ -0,0 +1,8 @@
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+# Override the files/etc/ckan-worker.conf file with env vars
+envsubst < $APP_DIR/files/etc/ckan-worker.conf > /etc/supervisor/conf.d/ckan-worker.conf
+envsubst < $APP_DIR/files/etc/ckan-dev.conf > /etc/supervisor/conf.d/ckan-dev.conf
+# envsubst < $APP_DIR/files/etc/ckan.conf > /etc/supervisor/conf.d/ckan.conf

From 9b2c0c6472fbf70dca6665c6b17db76db34eca17 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 00:29:37 -0300
Subject: [PATCH 09/27] ckan.ini

---
 docker/ckan/Dockerfile                        |  1 +
 docker/ckan/files/env/prod.env                |  6 +++
 .../ckan/files/scripts/setup-ckan-ini-file.sh | 43 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 docker/ckan/files/scripts/setup-ckan-ini-file.sh

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index b861f99..bcef81c 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -29,6 +29,7 @@ USER ckan
 # Install CKAN
 RUN mv ${APP_DIR}/files/ckan.ini ${CKAN_INI}
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
+RUN ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
 
 COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
 
diff --git a/docker/ckan/files/env/prod.env b/docker/ckan/files/env/prod.env
index 09f4b8e..c1dce28 100644
--- a/docker/ckan/files/env/prod.env
+++ b/docker/ckan/files/env/prod.env
@@ -1,2 +1,8 @@
 IS_DEV_ENV=false
 CKAN_DEBUG=false
+
+SECRET_KEY=CHANGE-ME
+BEAKER_SESSION_SECRET=CHANGE-ME
+BEAKER_SESSION_VALIDATE_KEY=CHANGE-ME
+CKAN_SITE_URL=https://change-me.com
+
diff --git a/docker/ckan/files/scripts/setup-ckan-ini-file.sh b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
new file mode 100644
index 0000000..fe13531
--- /dev/null
+++ b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
@@ -0,0 +1,43 @@
+#!/bin/bash -e
+
+# load env vars from ${APP_DIR}/.env
+set -o allexport
+. ${APP_DIR}/.env
+set +o allexport
+
+echo "Setting up configuration file for $ENV_NAME environment"
+
+cd $APP_DIR
+
+ckan config-tool ckan.ini "SECRET_KEY=${SECRET_KEY}"
+ckan config-tool ckan.ini "beaker.session.secret=${BEAKER_SESSION_SECRET}"
+ckan config-tool ckan.ini "beaker.session.validate_key = ${BEAKER_SESSION_VALIDATE_KEY}"
+
+# debug
+ckan config-tool ckan.ini "debug = ${CKAN_DEBUG}"
+
+ckan config-tool ckan.ini "ckan.site_url = ${CKAN_SITE_URL}"
+ckan config-tool ckan.ini "ckan.storage_path = $APP_DIR/${CKAN_STORAGE_FOLDER}"
+
+# Example: postgresql://<user>:<pass>@<name>.postgres.database.azure.com/ckan?sslmode=require
+ckan config-tool ckan.ini "sqlalchemy.url = ${SQLALCHEMY_URL}"
+# Example: https://<name>.azurewebsites.net/solr/ckan
+ckan config-tool ckan.ini "solr_url = ${SOLR_URL}"
+# Example: 'rediss://default:<pass>@<name>.redis.cache.windows.net:6380'
+ckan config-tool ckan.ini "ckan.redis.url = ${CKAN_REDIS_URL}"
+
+# Example: postgresql://<user>:<pass>@<name>.postgres.database.azure.com/datastore_default?sslmode=require
+# ckan config-tool ckan.ini "ckan.datastore.write_url = ${DATASTORE_WRITE_URL}"
+# ckan config-tool ckan.ini "ckan.datastore.read_url = ${DATASTORE_READ_URL}"
+
+# It look like the local auth app is different from the dev env app
+if [ "$ENV_NAME" = "local" ] ; then
+    # Increase vervosity for local environment
+    ckan config-tool ckan.ini -s logger_ckan "level = INFO"
+    ckan config-tool ckan.ini -s logger_ckanext "level = DEBUG"
+else
+    ckan config-tool ckan.ini -s logger_ckan "level = INFO"
+    ckan config-tool ckan.ini -s logger_ckanext "level = INFO"
+fi
+
+echo "Configuration file setup complete"

From f9081beb9c2f75876d5abc322cb9c3e2269ea932 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 01:38:57 -0300
Subject: [PATCH 10/27] closer

---
 docker/ckan/Dockerfile                        | 28 +++++++++++++---
 docker/ckan/files/ckan.ini                    |  4 +--
 docker/ckan/files/env/base.env                |  4 +--
 docker/ckan/files/etc/ckan-dev.conf           |  4 +--
 docker/ckan/files/etc/ckan-worker.conf        |  2 +-
 docker/ckan/files/etc/supervisord.base        | 29 +++++++++++++++++
 docker/ckan/files/scripts/entrypoint.sh       | 14 +++++---
 .../scripts/prepare-local-dev-extensions.sh   |  1 +
 .../ckan/files/scripts/prepare-supervisor.sh  |  3 ++
 .../ckan/files/scripts/setup-ckan-ini-file.sh | 32 +++++++++----------
 10 files changed, 89 insertions(+), 32 deletions(-)
 create mode 100644 docker/ckan/files/etc/supervisord.base
 mode change 100644 => 100755 docker/ckan/files/scripts/setup-ckan-ini-file.sh

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index bcef81c..c6b417f 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -11,28 +11,48 @@ ENV CKAN_INI=${APP_DIR}/ckan.ini
 WORKDIR ${APP_DIR}
 RUN apt update
 
-COPY files ${APP_DIR}/files
+# Copy files one by one to ensure Dockerfile is caching layers
+# and the change in one file does not invalidate the cache of the others
 
 # Prepare the environment vars
+COPY files/scripts/build-env-vars.sh ${APP_DIR}/files/scripts/build-env-vars.sh
+
+COPY files/env/base.env ${APP_DIR}/files/env/base.env
+COPY files/env/${ENV_NAME}.env ${APP_DIR}/files/env/${ENV_NAME}.env
 RUN ${APP_DIR}/files/scripts/build-env-vars.sh
 
 # Install OS dependencies
+COPY files/scripts/install-python.sh ${APP_DIR}/files/scripts/install-python.sh
 RUN ${APP_DIR}/files/scripts/install-python.sh
+
+COPY files/scripts/install-os-deps.sh ${APP_DIR}/files/scripts/install-os-deps.sh
 RUN ${APP_DIR}/files/scripts/install-os-deps.sh
+
+COPY files/etc/supervisord.base ${APP_DIR}/files/etc/supervisord.conf
+COPY files/etc/ckan*.conf ${APP_DIR}/files/etc/
+COPY files/scripts/prepare-supervisor.sh ${APP_DIR}/files/scripts/prepare-supervisor.sh
 RUN ${APP_DIR}/files/scripts/prepare-supervisor.sh
 
+# Copy all pending files
+COPY files/scripts/prepare-local-dev-extensions.sh ${APP_DIR}/files/scripts/prepare-local-dev-extensions.sh
+COPY files/cert/localhost.cert ${APP_DIR}/files/cert/localhost.cert
+COPY files/cert/localhost.key ${APP_DIR}/files/cert/localhost.key
+
+COPY files/patches ${APP_DIR}/files/patches
+COPY files/ckan.ini ${CKAN_INI}
+COPY files/scripts/install-ckan.sh ${APP_DIR}/files/scripts/install-ckan.sh
+COPY files/scripts/setup-ckan-ini-file.sh ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
+COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
+
 # Create the ckan user
 RUN useradd -m -s /bin/bash ckan
 RUN chown ckan -R ${APP_DIR}
 USER ckan
 
 # Install CKAN
-RUN mv ${APP_DIR}/files/ckan.ini ${CKAN_INI}
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
 RUN ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
 
-COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
-
 HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 EXPOSE 5000
 
diff --git a/docker/ckan/files/ckan.ini b/docker/ckan/files/ckan.ini
index 6a44270..7083b05 100644
--- a/docker/ckan/files/ckan.ini
+++ b/docker/ckan/files/ckan.ini
@@ -138,7 +138,7 @@ ckan.cors.origin_allow_all = false
 ckan.cors.origin_whitelist =
 
 ## Plugins Settings ############################################################
-ckan.plugins = stats activity datastore datatables_view resource_proxy pdf_view geo_view
+ckan.plugins =
 ckan.resource_proxy.timeout = 5
 
 ## Front-End Settings ##########################################################
@@ -160,7 +160,7 @@ ckan.debug_supress_header = false
 ckan.site_custom_css =
 
 ## Resource Views Settings #####################################################
-ckan.views.default_views = datatables_view geo_view pdf_view
+ckan.views.default_views =
 
 ## Theming Settings ############################################################
 ckan.template_title_delimiter = -
diff --git a/docker/ckan/files/env/base.env b/docker/ckan/files/env/base.env
index d7d4369..c405c28 100644
--- a/docker/ckan/files/env/base.env
+++ b/docker/ckan/files/env/base.env
@@ -16,8 +16,8 @@ CKAN_SITE_URL=https://localhost:5000
 CKAN_DEBUG=true
 # https://github.com/ckan/ckan-postgres-dev/blob/main/Dockerfile
 SQLALCHEMY_URL=postgresql://ckan_default:pass@postgresql_uni/ckan_test
-SOLR_URL=http://solr_nrc:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis_nrc:6379/0
+SOLR_URL=http://solr_uni:8983/solr/ckan
+CKAN_REDIS_URL=redis://redis_uni:6379/0
 SECRET_KEY=flask-secret-key
 BEAKER_SESSION_SECRET=some-secret
 BEAKER_SESSION_VALIDATE_KEY=other-key
diff --git a/docker/ckan/files/etc/ckan-dev.conf b/docker/ckan/files/etc/ckan-dev.conf
index 1f1d462..9815703 100644
--- a/docker/ckan/files/etc/ckan-dev.conf
+++ b/docker/ckan/files/etc/ckan-dev.conf
@@ -1,5 +1,5 @@
 [program:ckan-worker]
-command=${APP_DIR}/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application
+command=$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application
 autostart=true
 autorestart=true
 redirect_stderr=true
@@ -8,5 +8,5 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 user=ckan
-environment=HOME="${APP_DIR}",USER="ckan"
+environment=HOME="$APP_DIR",USER="ckan"
 
diff --git a/docker/ckan/files/etc/ckan-worker.conf b/docker/ckan/files/etc/ckan-worker.conf
index 7b4a819..6abd017 100644
--- a/docker/ckan/files/etc/ckan-worker.conf
+++ b/docker/ckan/files/etc/ckan-worker.conf
@@ -9,4 +9,4 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stdout
 stderr_logfile_maxbytes=0
 user=ckan
-environment=HOME="${APP_DIR}",USER="ckan"
+environment=HOME="$APP_DIR",USER="ckan"
diff --git a/docker/ckan/files/etc/supervisord.base b/docker/ckan/files/etc/supervisord.base
new file mode 100644
index 0000000..d08ff93
--- /dev/null
+++ b/docker/ckan/files/etc/supervisord.base
@@ -0,0 +1,29 @@
+; supervisor config file
+
+[unix_http_server]
+file=$APP_DIR/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+chown=ckan:ckan
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=$APP_DIR/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix://$APP_DIR/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index f7a684c..c0fd049 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -41,16 +41,20 @@ ckan config-tool ckan.ini "ckanext.datapusher_plus.api_token=${DATAPUSHER_TOKEN}
 # Rebuild webassets in can they were patched
 ckan asset build
 
-# Execute gunicorn pointing to CKAN's wsgi application
-echo "Starting gunicorn"
-GUNICORN=${APP_DIR}/venv/bin//gunicorn
-
+# Start supervidor
+echo "Supervisor start"
+supervisorctl start
+echo "Updating supervisor"
+supervisorctl reread
+supervisorctl update
 
 # Start the development server as the ckan user with automatic reload
+echo "Starting CKAN gunicorn"
 if [ "$IS_DEV_ENV" = "true" ] ; then
     supervisorctl start ckan-dev
 else
-    $GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360
+    supervisorctl start ckan
+    # $GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360
 fi
 
 echo "Finished entrypoint.sh"
diff --git a/docker/ckan/files/scripts/prepare-local-dev-extensions.sh b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
index 3897fd2..23a1a60 100755
--- a/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
+++ b/docker/ckan/files/scripts/prepare-local-dev-extensions.sh
@@ -3,6 +3,7 @@
 # From ckan docker base
 # https://github.com/ckan/ckan-docker-base/blob/main/ckan-2.10/dev/setup/start_ckan_development.sh#L9-L48
 # All CKAN extensions in this folder will be installed in the CKAN development environment
+source ${APP_DIR}/venv/bin/activate
 cd $APP_DIR
 
 SRC_EXTENSIONS_DIR=$APP_DIR/src_extensions
diff --git a/docker/ckan/files/scripts/prepare-supervisor.sh b/docker/ckan/files/scripts/prepare-supervisor.sh
index 5579328..ddb0eee 100755
--- a/docker/ckan/files/scripts/prepare-supervisor.sh
+++ b/docker/ckan/files/scripts/prepare-supervisor.sh
@@ -2,6 +2,9 @@ set -o allexport
 . ${APP_DIR}/.env
 set +o allexport
 
+# Define the "ckan" user as the owner of supervisor processes
+envsubst < $APP_DIR/files/etc/supervisord.conf > /etc/supervisor/supervisord.conf
+
 # Override the files/etc/ckan-worker.conf file with env vars
 envsubst < $APP_DIR/files/etc/ckan-worker.conf > /etc/supervisor/conf.d/ckan-worker.conf
 envsubst < $APP_DIR/files/etc/ckan-dev.conf > /etc/supervisor/conf.d/ckan-dev.conf
diff --git a/docker/ckan/files/scripts/setup-ckan-ini-file.sh b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
old mode 100644
new mode 100755
index fe13531..5ca0ca8
--- a/docker/ckan/files/scripts/setup-ckan-ini-file.sh
+++ b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
@@ -6,38 +6,38 @@ set -o allexport
 set +o allexport
 
 echo "Setting up configuration file for $ENV_NAME environment"
-
+source ${APP_DIR}/venv/bin/activate
 cd $APP_DIR
 
-ckan config-tool ckan.ini "SECRET_KEY=${SECRET_KEY}"
-ckan config-tool ckan.ini "beaker.session.secret=${BEAKER_SESSION_SECRET}"
-ckan config-tool ckan.ini "beaker.session.validate_key = ${BEAKER_SESSION_VALIDATE_KEY}"
+ckan config-tool ${CKAN_INI} "SECRET_KEY=${SECRET_KEY}"
+ckan config-tool ${CKAN_INI} "beaker.session.secret=${BEAKER_SESSION_SECRET}"
+ckan config-tool ${CKAN_INI} "beaker.session.validate_key = ${BEAKER_SESSION_VALIDATE_KEY}"
 
 # debug
-ckan config-tool ckan.ini "debug = ${CKAN_DEBUG}"
+ckan config-tool ${CKAN_INI} "debug = ${CKAN_DEBUG}"
 
-ckan config-tool ckan.ini "ckan.site_url = ${CKAN_SITE_URL}"
-ckan config-tool ckan.ini "ckan.storage_path = $APP_DIR/${CKAN_STORAGE_FOLDER}"
+ckan config-tool ${CKAN_INI} "ckan.site_url = ${CKAN_SITE_URL}"
+ckan config-tool ${CKAN_INI} "ckan.storage_path = $APP_DIR/${CKAN_STORAGE_FOLDER}"
 
 # Example: postgresql://<user>:<pass>@<name>.postgres.database.azure.com/ckan?sslmode=require
-ckan config-tool ckan.ini "sqlalchemy.url = ${SQLALCHEMY_URL}"
+ckan config-tool ${CKAN_INI} "sqlalchemy.url = ${SQLALCHEMY_URL}"
 # Example: https://<name>.azurewebsites.net/solr/ckan
-ckan config-tool ckan.ini "solr_url = ${SOLR_URL}"
+ckan config-tool ${CKAN_INI} "solr_url = ${SOLR_URL}"
 # Example: 'rediss://default:<pass>@<name>.redis.cache.windows.net:6380'
-ckan config-tool ckan.ini "ckan.redis.url = ${CKAN_REDIS_URL}"
+ckan config-tool ${CKAN_INI} "ckan.redis.url = ${CKAN_REDIS_URL}"
 
 # Example: postgresql://<user>:<pass>@<name>.postgres.database.azure.com/datastore_default?sslmode=require
-# ckan config-tool ckan.ini "ckan.datastore.write_url = ${DATASTORE_WRITE_URL}"
-# ckan config-tool ckan.ini "ckan.datastore.read_url = ${DATASTORE_READ_URL}"
+# ckan config-tool ${CKAN_INI} "ckan.datastore.write_url = ${DATASTORE_WRITE_URL}"
+# ckan config-tool ${CKAN_INI} "ckan.datastore.read_url = ${DATASTORE_READ_URL}"
 
 # It look like the local auth app is different from the dev env app
 if [ "$ENV_NAME" = "local" ] ; then
     # Increase vervosity for local environment
-    ckan config-tool ckan.ini -s logger_ckan "level = INFO"
-    ckan config-tool ckan.ini -s logger_ckanext "level = DEBUG"
+    ckan config-tool ${CKAN_INI} -s logger_ckan "level = INFO"
+    ckan config-tool ${CKAN_INI} -s logger_ckanext "level = DEBUG"
 else
-    ckan config-tool ckan.ini -s logger_ckan "level = INFO"
-    ckan config-tool ckan.ini -s logger_ckanext "level = INFO"
+    ckan config-tool ${CKAN_INI} -s logger_ckan "level = INFO"
+    ckan config-tool ${CKAN_INI} -s logger_ckanext "level = INFO"
 fi
 
 echo "Configuration file setup complete"

From cdbb3a790892d7a1c77c2aca77476ee83300a937 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 02:06:05 -0300
Subject: [PATCH 11/27] Almost

---
 docker/ckan/Dockerfile                        |  1 +
 .../files/etc/{ckan-dev.conf => ckan.conf}    |  3 ++-
 docker/ckan/files/scripts/entrypoint.sh       | 19 ++++++++++++-------
 .../ckan/files/scripts/prepare-supervisor.sh  | 17 +++++++++++++++--
 4 files changed, 30 insertions(+), 10 deletions(-)
 rename docker/ckan/files/etc/{ckan-dev.conf => ckan.conf} (93%)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index c6b417f..dd76781 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -47,6 +47,7 @@ COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh
 # Create the ckan user
 RUN useradd -m -s /bin/bash ckan
 RUN chown ckan -R ${APP_DIR}
+RUN chown ckan -R /var/log/supervisor
 USER ckan
 
 # Install CKAN
diff --git a/docker/ckan/files/etc/ckan-dev.conf b/docker/ckan/files/etc/ckan.conf
similarity index 93%
rename from docker/ckan/files/etc/ckan-dev.conf
rename to docker/ckan/files/etc/ckan.conf
index 9815703..835482f 100644
--- a/docker/ckan/files/etc/ckan-dev.conf
+++ b/docker/ckan/files/etc/ckan.conf
@@ -1,4 +1,5 @@
-[program:ckan-worker]
+[program:ckan]
+;command=$CMD
 command=$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application
 autostart=true
 autorestart=true
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index c0fd049..cf943b9 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -43,18 +43,23 @@ ckan asset build
 
 # Start supervidor
 echo "Supervisor start"
-supervisorctl start
+# get all stdout and stderr for "service supervisor start"
+service supervisor start
+echo "Supervisor started: $?"
+
 echo "Updating supervisor"
 supervisorctl reread
+echo "Superivsor reread: $?"
 supervisorctl update
+echo "Superivsor update: $?"
 
 # Start the development server as the ckan user with automatic reload
 echo "Starting CKAN gunicorn"
-if [ "$IS_DEV_ENV" = "true" ] ; then
-    supervisorctl start ckan-dev
-else
-    supervisorctl start ckan
-    # $GUNICORN -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360
-fi
+supervisorctl start ckan
 
 echo "Finished entrypoint.sh"
+
+while true; do
+  sleep 1000
+  echo "Sleeping"
+done
diff --git a/docker/ckan/files/scripts/prepare-supervisor.sh b/docker/ckan/files/scripts/prepare-supervisor.sh
index ddb0eee..74344d6 100755
--- a/docker/ckan/files/scripts/prepare-supervisor.sh
+++ b/docker/ckan/files/scripts/prepare-supervisor.sh
@@ -4,8 +4,21 @@ set +o allexport
 
 # Define the "ckan" user as the owner of supervisor processes
 envsubst < $APP_DIR/files/etc/supervisord.conf > /etc/supervisor/supervisord.conf
+echo "Supervisor configuration"
+cat /etc/supervisor/supervisord.conf
 
 # Override the files/etc/ckan-worker.conf file with env vars
 envsubst < $APP_DIR/files/etc/ckan-worker.conf > /etc/supervisor/conf.d/ckan-worker.conf
-envsubst < $APP_DIR/files/etc/ckan-dev.conf > /etc/supervisor/conf.d/ckan-dev.conf
-# envsubst < $APP_DIR/files/etc/ckan.conf > /etc/supervisor/conf.d/ckan.conf
+echo "CKAN worker configuration"
+cat /etc/supervisor/conf.d/ckan-worker.conf
+
+# Prepaer the ckan supervisor command
+if [ "$IS_DEV_ENV" = "true" ] ; then
+    CMD="$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application"
+else
+    CMD="$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
+fi
+
+envsubst < $APP_DIR/files/etc/ckan.conf > /etc/supervisor/conf.d/ckan.conf
+echo "CKAN configuration"
+cat /etc/supervisor/conf.d/ckan.conf

From 8c1037a30a2593de4682cbc419464105b14030eb Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 02:28:27 -0300
Subject: [PATCH 12/27] Working!

---
 docker/Makefile                           | 7 +++++--
 docker/ckan/Dockerfile                    | 2 ++
 docker/ckan/files/etc/ckan-worker.conf    | 7 ++-----
 docker/ckan/files/etc/ckan.conf           | 7 ++-----
 docker/ckan/files/scripts/entrypoint.sh   | 5 +----
 docker/ckan/files/scripts/install-ckan.sh | 3 +--
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/docker/Makefile b/docker/Makefile
index 82dc663..7246b6c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -19,7 +19,7 @@ clean:
 
 debug:
 	docker compose build
-	docker compose run --service-ports ckan
+	docker compose run --service-ports ckan_uni
 
 up:
 	docker compose up
@@ -29,4 +29,7 @@ build-up:
 	docker compose up
 
 ckan-worker:
-	docker compose exec ckan ckan jobs worker
+	docker compose exec ckan_uni ckan jobs worker
+
+bash:
+	docker compose exec ckan_uni bash
diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index dd76781..0348039 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -52,6 +52,8 @@ USER ckan
 
 # Install CKAN
 RUN ${APP_DIR}/files/scripts/install-ckan.sh
+RUN cp $APP_DIR/ckan/wsgi.py .
+RUN chmod u+x wsgi.py
 RUN ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
 
 HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
diff --git a/docker/ckan/files/etc/ckan-worker.conf b/docker/ckan/files/etc/ckan-worker.conf
index 6abd017..9ab29bc 100644
--- a/docker/ckan/files/etc/ckan-worker.conf
+++ b/docker/ckan/files/etc/ckan-worker.conf
@@ -1,12 +1,9 @@
 [program:ckan-worker]
-command=ckan -c $CKAN_INI jobs worker 
+command=/bin/bash -c 'source $APP_DIR/venv/bin/activate && $APP_DIR/venv/bin/ckan -c $CKAN_INI jobs worker'
 priority=501
 autostart=true
 autorestart=true
 redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stdout_logfile=/var/log/supervisor/ckan-worker.log
 user=ckan
 environment=HOME="$APP_DIR",USER="ckan"
diff --git a/docker/ckan/files/etc/ckan.conf b/docker/ckan/files/etc/ckan.conf
index 835482f..6f756e0 100644
--- a/docker/ckan/files/etc/ckan.conf
+++ b/docker/ckan/files/etc/ckan.conf
@@ -1,13 +1,10 @@
 [program:ckan]
 ;command=$CMD
-command=$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application
+command=/bin/bash -c 'source $APP_DIR/venv/bin/activate && $APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application'
 autostart=true
 autorestart=true
 redirect_stderr=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stdout_logfile=/var/log/supervisor/ckan.log
 user=ckan
 environment=HOME="$APP_DIR",USER="ckan"
 
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index cf943b9..4b5f00b 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -59,7 +59,4 @@ supervisorctl start ckan
 
 echo "Finished entrypoint.sh"
 
-while true; do
-  sleep 1000
-  echo "Sleeping"
-done
+tail -f /var/log/supervisor/*.log
diff --git a/docker/ckan/files/scripts/install-ckan.sh b/docker/ckan/files/scripts/install-ckan.sh
index d48285d..ad9cdfc 100755
--- a/docker/ckan/files/scripts/install-ckan.sh
+++ b/docker/ckan/files/scripts/install-ckan.sh
@@ -15,8 +15,7 @@ echo "Creating CKAN storage directory: $CKAN_STORAGE_FOLDER"
 mkdir -p ${APP_DIR}/${CKAN_STORAGE_FOLDER}
 
 # Create a source folder
-mkdir src
-cd src
+cd ${APP_DIR}
 git clone -b "$CKAN_GIT_BRANCH" $CKAN_GIT_URL ckan
 cd ckan
 

From e9afd828787d1a3348183ce6171caabc52f91e28 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 14 Oct 2024 02:38:56 -0300
Subject: [PATCH 13/27] Maybe

---
 docker/ckan/Dockerfile                  |  4 ++--
 docker/ckan/files/scripts/entrypoint.sh | 13 +------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/docker/ckan/Dockerfile b/docker/ckan/Dockerfile
index 0348039..314afc1 100644
--- a/docker/ckan/Dockerfile
+++ b/docker/ckan/Dockerfile
@@ -42,7 +42,6 @@ COPY files/patches ${APP_DIR}/files/patches
 COPY files/ckan.ini ${CKAN_INI}
 COPY files/scripts/install-ckan.sh ${APP_DIR}/files/scripts/install-ckan.sh
 COPY files/scripts/setup-ckan-ini-file.sh ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
-COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
 
 # Create the ckan user
 RUN useradd -m -s /bin/bash ckan
@@ -59,4 +58,5 @@ RUN ${APP_DIR}/files/scripts/setup-ckan-ini-file.sh
 HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit 1
 EXPOSE 5000
 
-ENTRYPOINT [ "./entrypoint.sh" ]
\ No newline at end of file
+COPY files/scripts/entrypoint.sh ${APP_DIR}/entrypoint.sh 
+ENTRYPOINT [ "./entrypoint.sh" ]
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index 4b5f00b..e4b34f6 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -43,20 +43,9 @@ ckan asset build
 
 # Start supervidor
 echo "Supervisor start"
-# get all stdout and stderr for "service supervisor start"
 service supervisor start
-echo "Supervisor started: $?"
-
-echo "Updating supervisor"
-supervisorctl reread
-echo "Superivsor reread: $?"
-supervisorctl update
-echo "Superivsor update: $?"
-
-# Start the development server as the ckan user with automatic reload
-echo "Starting CKAN gunicorn"
-supervisorctl start ckan
 
 echo "Finished entrypoint.sh"
+sleep 3
 
 tail -f /var/log/supervisor/*.log

From 9bc4e642e50366b3624c0abbf896295a57cd59c6 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 19:35:21 -0300
Subject: [PATCH 14/27] Rename builds

---
 .github/workflows/publish-develop-image.yml | 8 ++++----
 .github/workflows/publish-latest-image.yml  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-develop-image.yml b/.github/workflows/publish-develop-image.yml
index ac2eb99..6b839b1 100644
--- a/.github/workflows/publish-develop-image.yml
+++ b/.github/workflows/publish-develop-image.yml
@@ -17,10 +17,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build develop version for ckan-base 2.9
+      - name: Build develop version for UNCKAN
         uses: docker/build-push-action@v2
         with:
-          context: ckan-2.9/ckan
-          file: ckan-2.9/ckan/Dockerfile
+          context: docker/ckan
+          file: docker/ckan/Dockerfile
           push: true
-          tags: avdata99/ckan-env:ckan29
+          tags: avdata99/unckan:dev
diff --git a/.github/workflows/publish-latest-image.yml b/.github/workflows/publish-latest-image.yml
index 5a85caf..2615fd7 100644
--- a/.github/workflows/publish-latest-image.yml
+++ b/.github/workflows/publish-latest-image.yml
@@ -17,10 +17,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build latest version for ckan-base 2.9
+      - name: Build develop version for UNCKAN
         uses: docker/build-push-action@v2
         with:
-          context: ckan-2.9/ckan
-          file: ckan-2.9/ckan/Dockerfile
+          context: docker/ckan
+          file: docker/ckan/Dockerfile
           push: true
-          tags: avdata99/ckan-env:latest
+          tags: avdata99/unckan:dev

From 520fde033b0969ed731bd4cc5f7cfb0d23187e19 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 19:50:51 -0300
Subject: [PATCH 15/27] Use version name

---
 .github/workflows/publish-develop-image.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-develop-image.yml b/.github/workflows/publish-develop-image.yml
index 6b839b1..74e3614 100644
--- a/.github/workflows/publish-develop-image.yml
+++ b/.github/workflows/publish-develop-image.yml
@@ -7,9 +7,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Read env vars from docker/ckan/files/env/base.env
+        id: env
+        run: |
+          echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
@@ -17,10 +22,10 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build develop version for UNCKAN
+      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: true
-          tags: avdata99/unckan:dev
+          tags: avdata99/unckan:dev-$CKAN_UNI_VERSION

From e8c5e118b36debcc7f91c3ba97dfd21b49eb7ac5 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 19:51:04 -0300
Subject: [PATCH 16/27] Test new ver name

---
 docker/ckan/files/env/base.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ckan/files/env/base.env b/docker/ckan/files/env/base.env
index c405c28..6b6aae4 100644
--- a/docker/ckan/files/env/base.env
+++ b/docker/ckan/files/env/base.env
@@ -1,7 +1,7 @@
 # Do not change this file for your local env
 # Use local.env to set your local env variables
 
-CKAN_UNI_VERSION=0.2.0
+CKAN_UNI_VERSION=0.4.1
 CKAN_GIT_URL=https://github.com/ckan/ckan.git
 CKAN_GIT_BRANCH=ckan-2.10.5
 

From 643d4a10b8a63e1af0b48bdf4c14b61db3ae705f Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:08:42 -0300
Subject: [PATCH 17/27] Preparing changes

---
 docker/ckan/files/ckan.ini                       | 10 +++++-----
 docker/ckan/files/etc/ckan.conf                  |  3 +--
 docker/ckan/files/scripts/entrypoint.sh          |  1 +
 docker/ckan/files/scripts/prepare-supervisor.sh  |  4 ++--
 docker/ckan/files/scripts/setup-ckan-ini-file.sh | 11 ++++++++++-
 docker/ckan/files/vars/base.env                  |  3 ---
 docker/ckan/files/vars/dev.env                   |  1 -
 7 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 docker/ckan/files/vars/base.env
 delete mode 100644 docker/ckan/files/vars/dev.env

diff --git a/docker/ckan/files/ckan.ini b/docker/ckan/files/ckan.ini
index 7083b05..e7471e2 100644
--- a/docker/ckan/files/ckan.ini
+++ b/docker/ckan/files/ckan.ini
@@ -142,11 +142,11 @@ ckan.plugins =
 ckan.resource_proxy.timeout = 5
 
 ## Front-End Settings ##########################################################
-ckan.site_title = CKAN
-ckan.site_description =
-ckan.site_intro_text =
+ckan.site_title = UNCKAN
+ckan.site_description = CKAN para Universidades
+ckan.site_intro_text = "Reemplaza este texto en ckan.site_intro_text"
 ckan.site_logo = /base/images/logo-left-aligned-positive.png
-ckan.site_about =
+ckan.site_about = "Reemplaza este texto en ckan.site_about"
 ckan.theme = css/main
 ckan.datasets_per_page = 20
 package_hide_extras =
@@ -225,7 +225,7 @@ ckan.root_path =
 ckan.resource_formats = /code/ckan/ckan/config/resource_formats.json
 
 ## CKAN tracking ###############################################################
-ckan.tracking_enabled = true
+ckan.tracking_enabled = false
 
 ## Form Settings ###############################################################
 ckan.dataset.create_on_ui_requires_resources = true
diff --git a/docker/ckan/files/etc/ckan.conf b/docker/ckan/files/etc/ckan.conf
index 6f756e0..a60e344 100644
--- a/docker/ckan/files/etc/ckan.conf
+++ b/docker/ckan/files/etc/ckan.conf
@@ -1,6 +1,5 @@
 [program:ckan]
-;command=$CMD
-command=/bin/bash -c 'source $APP_DIR/venv/bin/activate && $APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application'
+command=/bin/bash -c 'source $APP_DIR/venv/bin/activate && $CMD'
 autostart=true
 autorestart=true
 redirect_stderr=true
diff --git a/docker/ckan/files/scripts/entrypoint.sh b/docker/ckan/files/scripts/entrypoint.sh
index e4b34f6..d553f88 100755
--- a/docker/ckan/files/scripts/entrypoint.sh
+++ b/docker/ckan/files/scripts/entrypoint.sh
@@ -48,4 +48,5 @@ service supervisor start
 echo "Finished entrypoint.sh"
 sleep 3
 
+# Any other command to continue running and allow to stop CKAN
 tail -f /var/log/supervisor/*.log
diff --git a/docker/ckan/files/scripts/prepare-supervisor.sh b/docker/ckan/files/scripts/prepare-supervisor.sh
index 74344d6..4aa6bef 100755
--- a/docker/ckan/files/scripts/prepare-supervisor.sh
+++ b/docker/ckan/files/scripts/prepare-supervisor.sh
@@ -14,9 +14,9 @@ cat /etc/supervisor/conf.d/ckan-worker.conf
 
 # Prepaer the ckan supervisor command
 if [ "$IS_DEV_ENV" = "true" ] ; then
-    CMD="$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application"
+    CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application"
 else
-    CMD="$APP_DIR/venv/bin//gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
+    CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
 fi
 
 envsubst < $APP_DIR/files/etc/ckan.conf > /etc/supervisor/conf.d/ckan.conf
diff --git a/docker/ckan/files/scripts/setup-ckan-ini-file.sh b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
index 5ca0ca8..489756f 100755
--- a/docker/ckan/files/scripts/setup-ckan-ini-file.sh
+++ b/docker/ckan/files/scripts/setup-ckan-ini-file.sh
@@ -9,6 +9,15 @@ echo "Setting up configuration file for $ENV_NAME environment"
 source ${APP_DIR}/venv/bin/activate
 cd $APP_DIR
 
+# Validate required env vars
+VALIDATE_VARS="SECRET_KEY BEAKER_SESSION_SECRET BEAKER_SESSION_VALIDATE_KEY CKAN_SITE_URL CKAN_STORAGE_FOLDER SQLALCHEMY_URL SOLR_URL CKAN_REDIS_URL"
+for VAR in $VALIDATE_VARS; do
+  if [ -z "${!VAR}" ]; then
+    echo "$VAR is not set. Exiting."
+    exit 1
+  fi
+done
+
 ckan config-tool ${CKAN_INI} "SECRET_KEY=${SECRET_KEY}"
 ckan config-tool ${CKAN_INI} "beaker.session.secret=${BEAKER_SESSION_SECRET}"
 ckan config-tool ${CKAN_INI} "beaker.session.validate_key = ${BEAKER_SESSION_VALIDATE_KEY}"
@@ -31,7 +40,7 @@ ckan config-tool ${CKAN_INI} "ckan.redis.url = ${CKAN_REDIS_URL}"
 # ckan config-tool ${CKAN_INI} "ckan.datastore.read_url = ${DATASTORE_READ_URL}"
 
 # It look like the local auth app is different from the dev env app
-if [ "$ENV_NAME" = "local" ] ; then
+if [ "$IS_DEV_ENV" = "true" ] ; then
     # Increase vervosity for local environment
     ckan config-tool ${CKAN_INI} -s logger_ckan "level = INFO"
     ckan config-tool ${CKAN_INI} -s logger_ckanext "level = DEBUG"
diff --git a/docker/ckan/files/vars/base.env b/docker/ckan/files/vars/base.env
deleted file mode 100644
index 11a3afe..0000000
--- a/docker/ckan/files/vars/base.env
+++ /dev/null
@@ -1,3 +0,0 @@
-# The storage path will be inside $APP_DIR
-CKAN_STORAGE_PATH=ckan-storage
-
diff --git a/docker/ckan/files/vars/dev.env b/docker/ckan/files/vars/dev.env
deleted file mode 100644
index 19fcccc..0000000
--- a/docker/ckan/files/vars/dev.env
+++ /dev/null
@@ -1 +0,0 @@
-CKAN_DEBUG=true

From 3f076ac8096314d9f938ac3cedf1cb02a6e22751 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:15:39 -0300
Subject: [PATCH 18/27] fix envsubst var

---
 docker/ckan/files/scripts/prepare-supervisor.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ckan/files/scripts/prepare-supervisor.sh b/docker/ckan/files/scripts/prepare-supervisor.sh
index 4aa6bef..d70dac7 100755
--- a/docker/ckan/files/scripts/prepare-supervisor.sh
+++ b/docker/ckan/files/scripts/prepare-supervisor.sh
@@ -14,9 +14,9 @@ cat /etc/supervisor/conf.d/ckan-worker.conf
 
 # Prepaer the ckan supervisor command
 if [ "$IS_DEV_ENV" = "true" ] ; then
-    CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application"
+    export CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR --certfile=$APP_DIR/files/cert/localhost.cert --keyfile=$APP_DIR/files/cert/localhost.key --reload wsgi:application"
 else
-    CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
+    export CMD="$APP_DIR/venv/bin/gunicorn -w 4 -b 0.0.0.0:5000 --chdir $APP_DIR wsgi:application --timeout 360"
 fi
 
 envsubst < $APP_DIR/files/etc/ckan.conf > /etc/supervisor/conf.d/ckan.conf

From 3d75186838d69ea911f2c2927b0e0db29a1daf19 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:20:25 -0300
Subject: [PATCH 19/27] Fix gh actions

---
 .github/workflows/publish-develop-image.yml | 7 ++++---
 .github/workflows/publish-latest-image.yml  | 9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-develop-image.yml b/.github/workflows/publish-develop-image.yml
index 74e3614..3731846 100644
--- a/.github/workflows/publish-develop-image.yml
+++ b/.github/workflows/publish-develop-image.yml
@@ -11,8 +11,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Read env vars from docker/ckan/files/env/base.env
-        id: env
+      - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
         run: |
           echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
       - name: Set up Docker Buildx
@@ -28,4 +27,6 @@ jobs:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: true
-          tags: avdata99/unckan:dev-$CKAN_UNI_VERSION
+          tags: |
+            avdata99/unckan:dev
+            avdata99/unckan:dev-${{ CKAN_UNI_VERSION }}
diff --git a/.github/workflows/publish-latest-image.yml b/.github/workflows/publish-latest-image.yml
index 2615fd7..136bdef 100644
--- a/.github/workflows/publish-latest-image.yml
+++ b/.github/workflows/publish-latest-image.yml
@@ -10,6 +10,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
+        run: |
+          echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
@@ -17,10 +20,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build develop version for UNCKAN
+      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: true
-          tags: avdata99/unckan:dev
+          tags: |
+            avdata99/unckan:latest
+            avdata99/unckan:prod-${{ CKAN_UNI_VERSION }}

From e182262ed2afb33b8078ecd5ad4bc5d17288efed Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:22:20 -0300
Subject: [PATCH 20/27] Readme notes

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ca72c91..cca6121 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![Docker Stars](https://img.shields.io/docker/stars/avdata99/ckan-env.svg)](https://hub.docker.com/r/avdata99/ckan-env/tags)
-[![Docker Pulls](https://img.shields.io/docker/pulls/avdata99/ckan-env.svg)](https://hub.docker.com/r/avdata99/ckan-env/tags)
-[![Docker Automated](https://img.shields.io/docker/automated/avdata99/ckan-env.svg)](https://hub.docker.com/r/avdata99/ckan-env/tags)
-[![Docker Build](https://img.shields.io/docker/build/avdata99/ckan-env.svg)](https://hub.docker.com/r/avdata99/ckan-env/tags)
+[![Docker Stars](https://img.shields.io/docker/stars/avdata99/unckan.svg)](https://hub.docker.com/r/avdata99/unckan/tags)
+[![Docker Pulls](https://img.shields.io/docker/pulls/avdata99/unckan.svg)](https://hub.docker.com/r/avdata99/unckan/tags)
+[![Docker Automated](https://img.shields.io/docker/automated/avdata99/unckan.svg)](https://hub.docker.com/r/avdata99/unckan/tags)
+[![Docker Build](https://img.shields.io/docker/build/avdata99/unckan.svg)](https://hub.docker.com/r/avdata99/unckan/tags)
 
 # Entorno CKAN para Universidades Argentinas
 
@@ -15,9 +15,9 @@ Al estar desarrollado sobre CKAN este proyecto permite además subir datos manua
 ## Entorno
 
 El portal completo está compuesto por:
- - CKAN 2.9 (python 3)
+ - CKAN 2.10.5 (python 3)
    + Portal de datos base
- - Extensiones
+ - Extensiones (en progreso)
    + [SIU Harvester](https://github.com/unckan/ckanext-siu-harvester): Extensión para cosechar datos desde sistemas [SIU](https://www.siu.edu.ar/) usando la librería [pySIUData](https://github.com/unckan/pySIUdata) (creada especialmente como parte de este proceso).
    + [Dataset previews](https://github.com/unckan/ckanext-datasetpreview): Extensión CKAN para agregar gráficos a los datasets de manera simple.
    + El template CKAN usado está en el repositorio [UI Universidad](https://github.com/unckan/ckanext-ui-universidad).
@@ -32,4 +32,4 @@ docker-compose up
 
 ## Imagen pública
 
-La compilación de esta imagen esta [disponible en DockerHub](https://hub.docker.com/r/avdata99/ckan-env/tags?page=1&ordering=last_updated) (el tag ckan29 corresponde a la ultima version en desarrollo).  
+La compilación de esta imagen esta [disponible en DockerHub](https://hub.docker.com/r/avdata99/unckan/tags?page=1&ordering=last_updated).  

From e3b7df0fe90eef9f1f21bcf3e5bf06cc32c58bf7 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:24:44 -0300
Subject: [PATCH 21/27] Test build

---
 .github/workflows/test-build.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/test-build.yml

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
new file mode 100644
index 0000000..97d81f1
--- /dev/null
+++ b/.github/workflows/test-build.yml
@@ -0,0 +1,22 @@
+name: Test Build
+on: 
+  - push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
+        run: |
+          echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
+        uses: docker/build-push-action@v2
+        with:
+          context: docker/ckan
+          file: docker/ckan/Dockerfile
+          push: false

From cd1f2b20ca5e83fcc0e5e842e97c2a66f3926202 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:29:22 -0300
Subject: [PATCH 22/27] fix env vaer

---
 .github/workflows/test-build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 97d81f1..9638d61 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -9,14 +9,20 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
+        id: read_version
         run: |
           echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: false
+        env:
+          CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}

From 7d610e8dc45486f420e6832768d3a29377447b0d Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:30:46 -0300
Subject: [PATCH 23/27] fix var

---
 .github/workflows/test-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 9638d61..b7fb280 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
+      - name: Build develop UNCKAN ver ${{ env.CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan

From 325288c132f051740873fabc2e3a97726fdfdf56 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:35:17 -0300
Subject: [PATCH 24/27] Fix gh action build test

---
 .github/workflows/test-build.yml    | 5 ++++-
 docker/ckan/files/env/gh-action.env | 0
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 docker/ckan/files/env/gh-action.env

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index b7fb280..7024360 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -13,7 +13,9 @@ jobs:
       - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
         id: read_version
         run: |
-          echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
+          UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)
+          echo "CKAN_UNI_VERSION found $UNI_VERSION"
+          echo "CKAN_UNI_VERSION=$UNI_VERSION" >> $GITHUB_ENV
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -26,3 +28,4 @@ jobs:
           push: false
         env:
           CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}
+          ENV_NAME: "gh-action"
diff --git a/docker/ckan/files/env/gh-action.env b/docker/ckan/files/env/gh-action.env
new file mode 100644
index 0000000..e69de29

From eb748abca0f4b595cf0ff6f53b271f879d7be7b6 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:37:00 -0300
Subject: [PATCH 25/27] fix args

---
 .github/workflows/test-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 7024360..4cddc6c 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -25,7 +25,9 @@ jobs:
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
+          args: |
+            ENV_NAME=gh-action
           push: false
         env:
           CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}
-          ENV_NAME: "gh-action"
+          

From 343a313140c1b5e33c2644cb265f2e462f556dc7 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:39:35 -0300
Subject: [PATCH 26/27] build-args

---
 .github/workflows/test-build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 4cddc6c..1c6f594 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -25,8 +25,9 @@ jobs:
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
-          args: |
+          build-args: |
             ENV_NAME=gh-action
+            TZ=America/Argentina/Cordoba
           push: false
         env:
           CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}

From 441b5445e3df9f35c78f31aeae2ec68df736ab73 Mon Sep 17 00:00:00 2001
From: avdata99 <andres@data99.com.ar>
Date: Mon, 21 Oct 2024 20:43:48 -0300
Subject: [PATCH 27/27] Fix ver

---
 .github/workflows/publish-develop-image.yml | 13 +++++++++++--
 .github/workflows/publish-latest-image.yml  | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-develop-image.yml b/.github/workflows/publish-develop-image.yml
index 3731846..858a41c 100644
--- a/.github/workflows/publish-develop-image.yml
+++ b/.github/workflows/publish-develop-image.yml
@@ -11,22 +11,31 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
         run: |
           echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
+
+      - name: Build develop UNCKAN ver ${{ env.CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: true
+          build-args: |
+            ENV_NAME=gh-action
+            TZ=America/Argentina/Cordoba
           tags: |
             avdata99/unckan:dev
-            avdata99/unckan:dev-${{ CKAN_UNI_VERSION }}
+            avdata99/unckan:dev-${{ env.CKAN_UNI_VERSION }}
+        env:
+          CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}
diff --git a/.github/workflows/publish-latest-image.yml b/.github/workflows/publish-latest-image.yml
index 136bdef..8786df0 100644
--- a/.github/workflows/publish-latest-image.yml
+++ b/.github/workflows/publish-latest-image.yml
@@ -10,22 +10,31 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+
       - name: Read CKAN_UNI_VERSION from docker/ckan/files/env/base.env
         run: |
           echo "CKAN_UNI_VERSION=$(grep CKAN_UNI_VERSION docker/ckan/files/env/base.env | cut -d '=' -f2)" >> $GITHUB_ENV
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build develop UNCKAN ver ${{ CKAN_UNI_VERSION }}
+
+      - name: Build develop UNCKAN ver ${{ env.CKAN_UNI_VERSION }}
         uses: docker/build-push-action@v2
         with:
           context: docker/ckan
           file: docker/ckan/Dockerfile
           push: true
+          build-args: |
+            ENV_NAME=gh-action
+            TZ=America/Argentina/Cordoba
           tags: |
             avdata99/unckan:latest
-            avdata99/unckan:prod-${{ CKAN_UNI_VERSION }}
+            avdata99/unckan:${{ env.CKAN_UNI_VERSION }}
+        env:
+          CKAN_UNI_VERSION: ${{ env.CKAN_UNI_VERSION }}
\ No newline at end of file