diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..722d5e71 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vscode diff --git a/Dockerfile b/Dockerfile index 1b898e09..e2929b94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1-apache +FROM php:7.4-apache RUN a2enmod rewrite @@ -9,19 +9,19 @@ RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \ libfreetype6-dev \ libjpeg62-turbo-dev \ libmcrypt-dev \ - libpng12-dev \ + libpng-dev \ libjpeg-dev \ libmemcached-dev \ zlib1g-dev \ imagemagick # install the PHP extensions we need -RUN docker-php-ext-install -j$(nproc) iconv mcrypt \ +RUN docker-php-ext-install -j$(nproc) iconv \ pdo pdo_mysql mysqli gd -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ - +RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ +RUN docker-php-ext-install -j$(nproc) gd RUN curl -J -L -s -k \ - 'https://github.com/omeka/omeka-s/releases/download/v1.0.0-beta3/omeka-s.zip' \ + 'https://github.com/omeka/omeka-s/releases/download/v3.0.1/omeka-s-3.0.1.zip' \ -o /var/www/omeka-s.zip \ && unzip -q /var/www/omeka-s.zip -d /var/www/ \ && rm /var/www/omeka-s.zip \ diff --git a/README.md b/README.md index 1b97210b..abfe33c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Omeka-S in docker +Omeka-S in docker (version 3.01 abril 2021) There is also example of docker-compose.yml file which can be used for development. It creates 3 containers: @@ -8,3 +8,17 @@ It creates 3 containers: - omeka-s behind apache (modules or themes can be inserted via docker volumes `docker-compose up` + + +To build the image +docker build -t "name" + +docker images + +docker-compose up + +Updated DOCKER IMAGE in https://hub.docker.com/r/horaciod/omekasid + + + + diff --git a/docker-compose.yml b/docker-compose.yml index 40011a84..2d57656d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: depends_on: - db build: ./ - image: klokantech/omeka-s + image: horaciod/omeka3sid:latest ports: - "80:80" volumes: