Merge pull request #43 from GenomicDataInfrastructure/replace-extensions

fix: replace ckan extensions location

.gitmodules

@@ -2,19 +2,3 @@
 	path = src/ckanext-gdi-userportal
 	url = [email protected]:GenomicDataInfrastructure/ckanext-gdi-userportal.git
     branch = main
-[submodule "src/ckanext-dcat"]
-	path = src/ckanext-dcat
-	url = [email protected]:GenomicDataInfrastructure/gdi-userportal-ckanext-dcat.git
-    branch = user-portal-v1.5.1
-[submodule "src/ckanext-harvest"]
-	path = src/ckanext-harvest
-	url = [email protected]:GenomicDataInfrastructure/gdi-userportal-ckanext-harvest.git
-    branch = user-portal-v1.5.6
-[submodule "src/ckanext-scheming"]
-	path = src/ckanext-scheming
-	url = [email protected]:GenomicDataInfrastructure/gdi-userportal-ckanext-scheming.git
-    branch = user-portal-v3.0.0
-[submodule "src/ckanext-fairdatapoint"]
-	path = src/ckanext-fairdatapoint
-	url = https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git
-	branch = user-portal

CHANGELOG.md

@@ -9,10 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- Replaced all non-GDI extension locations by their original ones.
+
+### Security
+
 ## [v1.0.0] - 2024-01-30
 
 ### Added
-
 - ckanext-scheming v3.0.0.
 - ckanext-dcat v1.5.1.
 - ckanext-harvest v1.5.6.

ckan/Dockerfile

@@ -3,17 +3,16 @@ FROM ckan/ckan-base:2.10.3
 # Install any extensions needed by your CKAN instance
 # See Dockerfile.dev for more details and examples
 
-
 RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/[email protected]#egg=ckanext-gdi-userportal && \
      pip3 install -r ${APP_DIR}/src/ckanext-gdi-userportal/requirements.txt
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-dcat.git@user-portal-v1.5.1#egg=ckanext-dcat && \
+RUN  pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-dcat && \
      pip3 install -r ${APP_DIR}/src/ckanext-dcat/requirements.txt
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-harvest.git@user-portal-v1.5.6#egg=ckanext-harvest && \
-     pip3 install -r ${APP_DIR}/src/ckanext-harvest/requirements.txt
+RUN pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest && \
+    pip3 install -r ${APP_DIR}/src/ckanext-harvest/requirements.txt
 
-RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-scheming.git@user-portal-v3.0.0#egg=ckanext-scheming
+RUN pip3 install -e git+https://github.com/ckan/ckanext-scheming.git@release-3.0.0#egg=ckanext-scheming
 
 RUN  pip3 install -e git+https://github.com/DataShades/[email protected]#egg=ckanext-oidc-pkce && \
      pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt

ckan/Dockerfile.dev

@@ -1,8 +1,19 @@
 FROM ckan/ckan-dev:2.10.3
 
+RUN  pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-dcat && \
+     pip3 install -r ${APP_DIR}/src/ckanext-dcat/requirements.txt
+
+RUN pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest && \
+    pip3 install -r ${APP_DIR}/src/ckanext-harvest/requirements.txt
+
+RUN pip3 install -e git+https://github.com/ckan/[email protected]#egg=ckanext-scheming
+
 RUN  pip3 install -e git+https://github.com/DataShades/[email protected]#egg=ckanext-oidc-pkce && \
      pip3 install -r ${APP_DIR}/src/ckanext-oidc-pkce/requirements.txt
 
+RUN  pip3 install -e git+https://github.com/GenomicDataInfrastructure/gdi-userportal-ckanext-fairdatapoint.git@user-portal#egg=ckanext-fairdatapoint && \
+     pip3 install -r ${APP_DIR}/src/ckanext-fairdatapoint/requirements.txt
+
 # Clone the extension(s) your are writing for your own project in the `src` folder
 # to get them mounted in this image at runtime