Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Dockerfile errors #4

Merged
merged 2 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ build_images() {
DOCKER_BUILDKIT=1 docker build \
--build-arg="ENV=$env" \
--build-arg="CKAN_REF=$ckan_tag" \
-t "$tag_name" \
-t "$alt_tag_name" \
-t "$python_tag_name" \
-t "$python_alt_tag_name" \
"ckan-$ckan_version_ref"
-t "$tag_name" \
-t "$alt_tag_name" \
-t "$python_tag_name" \
-t "$python_alt_tag_name" \
"ckan-$ckan_version_ref"
}


Expand All @@ -70,7 +70,6 @@ push_images() {
docker push "$python_tag_name"
echo "Pushing $python_alt_tag_name"
docker push "$python_alt_tag_name"

}


Expand Down
7 changes: 2 additions & 5 deletions ckan-ukds-2.11/Dockerfile
chris-daly marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,12 @@ RUN python3 -m pip install -U pip && \
python3 -m pip install wheel && \
cd ${SRC_DIR} && \
python3 -m pip install -e git+${GIT_URL}@${CKAN_INSTALL_VERSION}#egg=ckan && \
cd ckan && \
python3 -m pip install --no-binary markdown -r requirements.txt && \
python3 -m pip install --no-binary markdown -r ${SRC_DIR}/ckan/requirements.txt && \
# Install CKAN Plugins including envvars to support loading config from environment variables
python3 -m pip install envvars && \
python3 -m pip install -e git+https://github.com/ckan/ckanext-pages.git#egg=ckanext-pages && \
python3 -m pip install ckanext-pdfview \
python3 -m pip install ckanext-envvars \
ckanext-geoview \
ckanext-matomo && \
python3 -m pip install -U requests[security] && \
python3 -m pip install ckanext-xloader && \
python3 -m pip install -r https://raw.githubusercontent.com/ckan/ckanext-xloader/master/requirements.txt && \
python3 -m pip install -e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext-harvest && \
Expand Down