fix: Docker compatibility with ARM SoCs

This commit is contained in:
Maicol Battistini 2024-08-19 16:09:01 +02:00
parent ebe4ca506d
commit d22a1592f6
No known key found for this signature in database
3 changed files with 9 additions and 4 deletions

View File

@ -94,9 +94,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit
## Build
To build a CKAN image run:
```sh
docker build --tag ghcr.io/keitaroinc/ckan:2.9.9 images/ckan/2.9
DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build --tag d4science-ckan:2.10.4-focal images/ckan/2.10
```
The -tag ghcr.io/keitaroinc/ckan:2.9.9 flag sets the image name to ghcr.io/keitaroinc/ckan:2.9.9 and 'images/ckan/2.9' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
The `-tag d4science-ckan:2.10.4-focal` flag sets the image name to d4science-ckan:2.10.4-focal and 'images/ckan/2.10' at the end tells docker build to use the context into the specified directory where the Dockerfile and related contents are.
## Upload to DockerHub
>*It's recommended to upload built images to DockerHub*

View File

@ -1,7 +1,7 @@
###################
### Extensions
###################
FROM registry.trust-itservices.com/d4science/ckan-docker/ckan:2.10.4-focal as extbuild
FROM d4science-ckan:2.10.4-focal as extbuild
# Switch to the root user
USER root
@ -13,7 +13,7 @@ RUN apt-get install python3-dev python3-pip libxml2-dev libxslt1-dev libgeos-c1v
############
### MAIN
############
FROM registry.trust-itservices.com/d4science/ckan-docker/ckan:2.10.4-focal
FROM d4science-ckan:2.10.4-focal
# Add the custom extensions to the plugins list
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher spatial_metadata spatial_query d4science d4science_theme

View File

@ -8,6 +8,7 @@ volumes:
services:
ckan:
platform: linux/amd64
container_name: ckan
build:
context: .
@ -38,6 +39,7 @@ services:
- ./docker-entrypoint.d:/srv/app/docker-entrypoint.d
datapusher:
platform: linux/amd64
container_name: datapusher
image: ghcr.io/keitaroinc/datapusher:${DATAPUSHER_VERSION}
networks:
@ -56,6 +58,7 @@ services:
db:
platform: linux/amd64
container_name: db
build:
context: .
@ -77,6 +80,7 @@ services:
solr:
container_name: solr
image: ckan/ckan-solr:2.10-solr9-spatial
platform: linux/amd64
networks:
- backend
env_file:
@ -89,6 +93,7 @@ services:
- ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
redis:
platform: linux/amd64
container_name: redis
image: redis:${REDIS_VERSION}
networks: