fix: Docker compatibility with ARM SoCs
This commit is contained in:
parent
ebe4ca506d
commit
d22a1592f6
|
@ -94,9 +94,9 @@ You can add scripts to CKAN custom images and copy them to the *docker-afterinit
|
||||||
## Build
|
## Build
|
||||||
To build a CKAN image run:
|
To build a CKAN image run:
|
||||||
```sh
|
```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
|
## Upload to DockerHub
|
||||||
>*It's recommended to upload built images to DockerHub*
|
>*It's recommended to upload built images to DockerHub*
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
###################
|
###################
|
||||||
### Extensions
|
### 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
|
# Switch to the root user
|
||||||
USER root
|
USER root
|
||||||
|
@ -13,7 +13,7 @@ RUN apt-get install python3-dev python3-pip libxml2-dev libxslt1-dev libgeos-c1v
|
||||||
############
|
############
|
||||||
### MAIN
|
### 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
|
# 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
|
ENV CKAN__PLUGINS envvars image_view text_view recline_view datastore datapusher spatial_metadata spatial_query d4science d4science_theme
|
||||||
|
|
|
@ -8,6 +8,7 @@ volumes:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ckan:
|
ckan:
|
||||||
|
platform: linux/amd64
|
||||||
container_name: ckan
|
container_name: ckan
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
|
@ -38,6 +39,7 @@ services:
|
||||||
- ./docker-entrypoint.d:/srv/app/docker-entrypoint.d
|
- ./docker-entrypoint.d:/srv/app/docker-entrypoint.d
|
||||||
|
|
||||||
datapusher:
|
datapusher:
|
||||||
|
platform: linux/amd64
|
||||||
container_name: datapusher
|
container_name: datapusher
|
||||||
image: ghcr.io/keitaroinc/datapusher:${DATAPUSHER_VERSION}
|
image: ghcr.io/keitaroinc/datapusher:${DATAPUSHER_VERSION}
|
||||||
networks:
|
networks:
|
||||||
|
@ -56,6 +58,7 @@ services:
|
||||||
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
|
platform: linux/amd64
|
||||||
container_name: db
|
container_name: db
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
|
@ -77,6 +80,7 @@ services:
|
||||||
solr:
|
solr:
|
||||||
container_name: solr
|
container_name: solr
|
||||||
image: ckan/ckan-solr:2.10-solr9-spatial
|
image: ckan/ckan-solr:2.10-solr9-spatial
|
||||||
|
platform: linux/amd64
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
env_file:
|
env_file:
|
||||||
|
@ -89,6 +93,7 @@ services:
|
||||||
- ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
|
- ${PWD}/solr8/ckan_init_solr.sh:/docker-entrypoint-initdb.d/ckan_init_solr.sh
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
|
platform: linux/amd64
|
||||||
container_name: redis
|
container_name: redis
|
||||||
image: redis:${REDIS_VERSION}
|
image: redis:${REDIS_VERSION}
|
||||||
networks:
|
networks:
|
||||||
|
|
Loading…
Reference in New Issue