Commit 16c6c4c2 authored by Jaime L Magiera's avatar Jaime L Magiera
Browse files

Merge branch 'development' into 'master'

Merge latest changes to Production

See merge request !8
parents d1feccd5 79d6318a
# omeka-s-rhel8
FROM ubi8/php-73
LABEL maintainer="Jaime Magiera <jaimelm@umich.edu>"
ENV BUILDER_VERSION 1.8
ENV BUILDER_VERSION 1.11
LABEL io.k8s.description="Platform for building omeka-s" \
io.k8s.display-name="Omeka-s" \
......@@ -21,8 +21,8 @@ RUN mv $STI_SCRIPTS_PATH/run $STI_SCRIPTS_PATH/run-base \
COPY ./s2i/bin/ /usr/libexec/s2i
COPY ./omeka-s/ /opt/app-root/src/omeka-s
COPY ./omeka-modules /opt/app-root/src/omeka/modules/
COPY ./omeka-themes /opt/app-root/src/omeka/themes/
COPY ./modules /opt/app-root/src/omeka-s/modules/
COPY ./themes /opt/app-root/src/omeka-s/themes/
# Replace config with correct mail properties
RUN rm /opt/app-root/src/omeka-s/config/local.config.php
......
# omeka-s-rhel8
FROM ubi8/php-73
LABEL maintainer="Jaime Magiera <jaimelm@umich.edu>"
ENV BUILDER_VERSION 1.11
LABEL io.k8s.description="Platform for building omeka-s" \
io.k8s.display-name="Omeka-s" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="builder,omeka"
USER root
RUN /bin/arch
RUN yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
RUN yum install -y gd msmtp && yum clean all -y
# TODO (optional): Copy the builder files into /opt/app-root
#COPY ./test/test-app/ /opt/app-root/
RUN mv $STI_SCRIPTS_PATH/run $STI_SCRIPTS_PATH/run-base \
&& mv $STI_SCRIPTS_PATH/assemble $STI_SCRIPTS_PATH/assemble-base
COPY ./s2i/bin/ /usr/libexec/s2i
COPY ./omeka-s/ /opt/app-root/src/omeka-s
COPY ./modules /opt/app-root/src/omeka-s/modules/
COPY ./themes /opt/app-root/src/omeka-s/themes/
RUN rm /opt/app-root/src/omeka-s/application/config/module.config.php
COPY ./config-application/application/config/module.config.php /opt/app-root/src/omeka-s/application/config/module.config.php
RUN rm /opt/app-root/src/omeka-s/application/src/Media/Ingester/OEmbed.php
COPY ./config-application/application/src/Media/Ingester/OEmbed.php /opt/app-root/src/omeka-s/application/src/Media/Ingester/OEmbed.php
# Replace config with correct mail properties
RUN rm /opt/app-root/src/omeka-s/config/local.config.php
COPY ./local.config.php /opt/app-root/src/omeka-s/config/local.config.php
# Set the smtp configuration to use msmtp instead of sendmail
RUN sed -i "s/sendmail/msmtp/g" /opt/app-root/src/omeka-s/application/config/module.config.php
RUN chown -R 1001:1001 /opt/app-root
USER 1001
EXPOSE 8080
CMD ["/usr/libexec/s2i/usage"]
## Omeka-S Source-2-Image (s2i) ##
Note: To update themes or modules that should be for all Omeka S builds place those at the root level of the repo in the respective folder (example: modules that should be for everyone should go in /modules). Those get incorporated into the builder image.
For any custom themes or modules that should be unique to a particular site, please make a folder at the root for that project and then subfolders within that for the custom content. For example: Project-Name/modules
<?php
return [
'logger' => [
'log' => false,
'log' => true,
'priority' => \Laminas\Log\Logger::NOTICE,
],
'http_client' => [
'sslcapath' => null,
'sslcafile' => null,
'sslcafile' => '/opt/app-root/src/omeka-s/config/um-certs2020.pem',
'adapter' => \Laminas\Http\Client\Adapter\Proxy::class,
'proxy_host' => 'squidproxy-01.lsait.lsa.umich.edu',
'proxy_port' => 3128,
],
'cli' => [
'phpcli_path' => "/usr/bin/php",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment