From 6b2c44d1bd0f9d7b71eb3460f047a56be665506d Mon Sep 17 00:00:00 2001 From: Hoacio Degiorgi Date: Mon, 12 Aug 2019 23:38:09 -0300 Subject: [PATCH 1/8] cambio de versionde omeka y nombre de imagen --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b898e09..a5b014b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ 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 \ @@ -21,7 +21,7 @@ RUN docker-php-ext-install -j$(nproc) iconv mcrypt \ RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ 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/v2.0.0/omeka-s-2.0.0.zip' \ -o /var/www/omeka-s.zip \ && unzip -q /var/www/omeka-s.zip -d /var/www/ \ && rm /var/www/omeka-s.zip \ @@ -29,7 +29,7 @@ RUN curl -J -L -s -k \ && mv /var/www/omeka-s /var/www/html \ && chown -R www-data:www-data /var/www/html -COPY ./database.ini /var/www/html/config/database.ini +COPY ./database1.ini /var/www/html/config/database.ini COPY ./imagemagick-policy.xml /etc/ImageMagick/policy.xml COPY ./.htaccess /var/www/html/.htaccess From daa85e829e516646fa39b7f26a6dc1c4207cde10 Mon Sep 17 00:00:00 2001 From: Hoacio Degiorgi Date: Mon, 12 Aug 2019 23:40:40 -0300 Subject: [PATCH 2/8] CAmbio en el nombre del archivo de la base de datos --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a5b014b7..9ebff9c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN curl -J -L -s -k \ && mv /var/www/omeka-s /var/www/html \ && chown -R www-data:www-data /var/www/html -COPY ./database1.ini /var/www/html/config/database.ini +COPY ./database.ini /var/www/html/config/database.ini COPY ./imagemagick-policy.xml /etc/ImageMagick/policy.xml COPY ./.htaccess /var/www/html/.htaccess From f945c3829d9a1909f4a9ea08426e836153c0782d Mon Sep 17 00:00:00 2001 From: Hoacio Degiorgi Date: Mon, 12 Aug 2019 23:43:41 -0300 Subject: [PATCH 3/8] README actualizado --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b97210b..b78fe115 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Omeka-S in docker +Omeka-S in docker (version 2.0 agosto 2019) There is also example of docker-compose.yml file which can be used for development. It creates 3 containers: @@ -8,3 +8,15 @@ It creates 3 containers: - omeka-s behind apache (modules or themes can be inserted via docker volumes `docker-compose up` + + +Creacion de la imagen +docker build -t + + +docker images + +docker-compose up + + + From 40c710b20e4a1c8582e8f5653dbee18745e854b6 Mon Sep 17 00:00:00 2001 From: Hoacio Degiorgi Date: Tue, 13 Aug 2019 12:15:33 -0300 Subject: [PATCH 4/8] cambio --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b78fe115..a394c4ad 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,4 @@ docker-compose up +actualizado From 5742e1f70b2a251b3397ad93c72984d81119414c Mon Sep 17 00:00:00 2001 From: Hoacio Degiorgi Date: Wed, 14 Aug 2019 12:37:06 -0300 Subject: [PATCH 5/8] =?UTF-8?q?faltabas=20soporte=20para=20jpeg=20en=20lib?= =?UTF-8?q?rer=C3=ADa=20GD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ebff9c9..bae0f998 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \ RUN docker-php-ext-install -j$(nproc) iconv mcrypt \ 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-install -j$(nproc) gd RUN curl -J -L -s -k \ 'https://github.com/omeka/omeka-s/releases/download/v2.0.0/omeka-s-2.0.0.zip' \ -o /var/www/omeka-s.zip \ From 8a724e909c30b396c3c6d40b1aadc4fd7546dbe7 Mon Sep 17 00:00:00 2001 From: Horacio Degiorgi Date: Wed, 14 Aug 2019 19:15:27 -0300 Subject: [PATCH 6/8] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a394c4ad..6484dbb0 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,15 @@ It creates 3 containers: `docker-compose up` -Creacion de la imagen -docker build -t - +To build the image +docker build -t "name" docker images docker-compose up +Updated DOCKER IMAGE in https://hub.docker.com/r/horaciod/omekasid + + -actualizado From 4e2c1732e4687b5c87982bd6069ecaa2ddb307d4 Mon Sep 17 00:00:00 2001 From: Horacio Degiorgi Date: Fri, 2 Apr 2021 17:48:02 -0300 Subject: [PATCH 7/8] cambio de version a v. 3.01 --- .gitignore | 1 + Dockerfile | 8 ++++---- docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .gitignore 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 bae0f998..e2929b94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1-apache +FROM php:7.4-apache RUN a2enmod rewrite @@ -16,12 +16,12 @@ RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \ 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/v2.0.0/omeka-s-2.0.0.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/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: From 6adad134206b9bb7e6284249679a92655f4a5200 Mon Sep 17 00:00:00 2001 From: Horacio Degiorgi Date: Fri, 2 Apr 2021 17:55:49 -0300 Subject: [PATCH 8/8] cambio en el readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6484dbb0..abfe33c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Omeka-S in docker (version 2.0 agosto 2019) +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: