Skip to content

Commit

Permalink
Merge pull request #131 from mjanez/ckan-2.9.11
Browse files Browse the repository at this point in the history
Update docker-compose.dev.yml to use dynamic service name for dependency
  • Loading branch information
mjanez authored May 17, 2024
2 parents 0a87134 + cf8db6d commit e958906
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ckan/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ COPY req_fixes req_fixes
## Pages - v0.5.2 ##
## PDFView - 0.0.8 ##
## Fluent - v1.0.1 (mjanez/Forked stable version) ##
## Scheming DCAT - v3.0.0 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ##
## Scheming DCAT - v3.1.0 (mjanez/GeoDCAT-AP/NTI-RISP extended version) ##
RUN echo ${TZ} > /etc/timezone && \

Check failure on line 26 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/build-docker-push:master

DL3013 warning: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`

Check failure on line 26 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / runner/build-docker-push:master

SC3013 warning: In POSIX sh, -ef is undefined.

Check failure on line 26 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / manual/build-docker-push:master

DL3013 warning: Pin versions in pip. Instead of `pip install <package>` use `pip install <package>==<version>` or `pip install --requirement <requirements file>`

Check failure on line 26 in ckan/Dockerfile

View workflow job for this annotation

GitHub Actions / manual/build-docker-push:master

SC3013 warning: In POSIX sh, -ef is undefined.
if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then cp /usr/share/zoneinfo/${TZ} /etc/localtime; fi && \
# Remove apk cache
Expand Down Expand Up @@ -54,7 +54,7 @@ RUN echo ${TZ} > /etc/timezone && \
echo "mjanez/ckanext-fluent" && \
pip3 install --no-cache-dir -e git+https://github.com/mjanez/[email protected]#egg=ckanext-fluent && \
echo "mjanez/ckanext-schemingdcat" && \
pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v3.0.0#egg=ckanext_schemingdcat && \
pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-schemingdcat.git@v3.1.0#egg=ckanext_schemingdcat && \
pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-schemingdcat/requirements.txt

# Used to configure the container environment by setting environment variables, creating users, running initialization scripts, .etc
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ services:
max-size: "100m"
max-file: "10"
depends_on:
- ckan-dev
- ${CKAN_DEV_COMPOSE_SERVICE}
ports:
- "0.0.0.0:${PYCSW_PORT_HOST}:${PYCSW_PORT}"
volumes:
Expand Down

0 comments on commit e958906

Please sign in to comment.