docker compose

.gitpod.yml

@@ -9,4 +9,6 @@ image:
 tasks:
   - init: docker compose build
     command: docker compose up
-
+  - name: local
+    command: sh ./dev-ckan.sh
+    openMode: split-right

Dockerfile

@@ -3,9 +3,13 @@ LABEL maintainer="[email protected]"
 ADD . /usr/lib/
 WORKDIR /usr/lib/
 
+RUN chmod 777 /usr/lib/ckan-run.sh
+
+ENV PATH=${PATH}:/usr/lib
+
 RUN pip install -r requirements.txt
 RUN python setup.py install
 
 EXPOSE 5000
 
-ENTRYPOINT [ "ckan-run.sh" ]
+ENTRYPOINT [ "/usr/lib/ckan-run.sh" ]

INSTALL.md

@@ -1,8 +0,0 @@
-python -m venv /workspace/ckan/ckan/default
-. /workspace/ckan/ckan/default/bin/activate
-pip install -r requirements.txt
-python setup.py install
-set -o allexport
-source .env.development
-ckan -c test-core.ini db init
-ckan -c test-core.ini run

ckan-db-init.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "Ejecución de migraciones"
+ckan -c /usr/lib/ckan/config/who.ini db init

ckan-run-dev.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+echo "....crea el entorno virtual"
+python -m venv /workspace/ckan/ckan/default
+. /workspace/ckan/ckan/default/bin/activate
+echo "....instala y buildea ckan"
+pip install -r requirements.txt
+python setup.py install
+echo "....carga variables de entorno"
+set -o allexport
+source .env.development
+echo "....ejecuta migraciones"
+ckan -c test-core.ini db init
+echo "....ckan run"
+ckan -c test-core.ini run

ckan-run.sh

@@ -1,6 +1,3 @@
-#/bin/bash
-echo "Ejecución de migraciones"
-ckan -c /usr/lib/who.ini db init
-
+#!/bin/bash
 echo "CKAN RUN"
-ckan -c /usr/lib/who.ini run
+ckan -c /usr/lib/ckan/config/who.ini run

ckan/config/who.ini

@@ -1,10 +1,28 @@
+## Site Settings
+ckan.site_url = http://ckan
+solr_url = http://solr:8983/solr/ckan
+sqlalchemy.url = postgresql://ckan:ckan@db:5432/ckan
+ckan.redis.url = redis://redis:6379/1
+
+## OAuth2 configuration
+ckanext.oidc_pkce.base_url = https://oauth2-server.com
+ckanext.oidc_pkce.client_id = clientid
+ckanext.oidc_pkce.client_secret = clientsecret
+ckanext.oidc_pkce.auth_path = /oidc/authorize
+ckanext.oidc_pkce.token_path = /oidc/token
+ckanext.oidc_pkce.userinfo_path = /oidc/userinfo
+ckanext.oidc_pkce.redirect_path = /local/oidc/handler
+ckanext.oidc_pkce.error_redirect = /user/register
+ckanext.oidc_pkce.scope = email
+ckanext.oidc_pkce.use_same_id = true
+
 [app:main]
 use = egg:ckan
 full_stack = true
 beaker.session.key = ckan
 beaker.session.secret = tBpNxJK_3Lmto4lUwGzPpE1jC
 
-who.config_file = /usr/lib/who.ini
+who.config_file = /usr/lib/ckan/config/who.ini
 
 [uwsgi]
 
@@ -66,24 +84,7 @@ plugins =
 plugins =
     friendlyform;browser
     #oauth2
-## Site Settings
-
-ckan.site_url = https://5000-maximilianopizar-ckan-mmka3dy1xc3.ws-us104.gitpod.io
-solr_url = http://solr:8983/solr/ckan
-sqlalchemy.url = postgresql://ckan:ckan@db:5432/ckan
-ckan.redis.url = redis://redis:6379/1
 
-## OAuth2 configuration
-ckanext.oidc_pkce.base_url = https://oauth2-server.com
-ckanext.oidc_pkce.client_id = clientid
-ckanext.oidc_pkce.client_secret = clientsecret
-ckanext.oidc_pkce.auth_path = /oidc/authorize
-ckanext.oidc_pkce.token_path = /oidc/token
-ckanext.oidc_pkce.userinfo_path = /oidc/userinfo
-ckanext.oidc_pkce.redirect_path = /local/oidc/handler
-ckanext.oidc_pkce.error_redirect = /user/register
-ckanext.oidc_pkce.scope = email
-ckanext.oidc_pkce.use_same_id = true
 
 
 

docker-compose.yml

@@ -7,24 +7,29 @@ volumes:
 networks:
   ckan_network:
     driver: bridge
+    ipam:
+      config:
+        - subnet: 172.18.0.0/16
+          gateway: 172.18.0.1    
 services:    
   ckan:
-      container_name: ckan-service
-      build: .
-      ports:
-          - "5000:5000"
-      environment:
-        - CKAN_INI=/usr/lib/who.ini      
-        - WTF_CSRF_ENABLED=False
-        - WTF_CSRF_CHECK_DEFAULT=True
-        - OAUTHLIB_INSECURE_TRANSPORT=True
-        - CKAN_SITE_URL=https://5000-maximilianopizar-ckan-labztrvi6bm.ws-us105.gitpod.io
-      volumes:
-        - ./who.ini:/usr/lib/who.ini          
-      depends_on:
-          - solr          
-      networks:
-          - ckan_network               
+    container_name: ckan-service
+    build: .
+    ports:
+        - "5000:5000"
+    environment:
+      - CKAN_INI=/usr/lib/ckan/config/who.ini      
+      - WTF_CSRF_ENABLED=False
+      - WTF_CSRF_CHECK_DEFAULT=True
+      - OAUTHLIB_INSECURE_TRANSPORT=True
+      - CKAN_SITE_URL=https://5000-maximilianopizar-ckan-labztrvi6bm.ws-us105.gitpod.io
+    volumes:
+      - ./who.ini:/usr/lib/ckan/config/who.ini         
+    depends_on:
+        - solr          
+    networks:
+      ckan_network:
+        ipv4_address: 172.18.0.2                        
   db:
     container_name: db
     build:
@@ -42,15 +47,17 @@ services:
     healthcheck:
       test: ["CMD", "pg_isready", "-U", "ckan"]
     networks:
-        - ckan_network       
+      ckan_network:
+        ipv4_address: 172.18.0.3        
   redis:
     container_name: redis
     image: redis:6
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "redis-cli", "-e", "QUIT"]     
     networks:
-        - ckan_network        
+      ckan_network:
+        ipv4_address: 172.18.0.4        
   solr:
     container_name: solr
     image: ckan/ckan-solr:2.9-solr8
@@ -62,5 +69,6 @@ services:
     depends_on:
         - db           
     networks:
-        - ckan_network       
+      ckan_network:
+        ipv4_address: 172.18.0.5