new file: Dockerfile.core

new file: Dockerfile.ingest deleted: LICENSE deleted: README.md new file: ReadMe.md new file: conf/supervisord_core.conf new file: conf/supervisord_ingest.conf modified: docker-compose.yml deleted: docker/conf/nginx/nginx.conf deleted: docker/conf/nginx/templates/default.conf.conf deleted: docker/core/20-supervisor.sh deleted: docker/core/Dockerfile deleted: docker/core/duckling-worker.conf deleted: docker/core/queue-worker.conf deleted: docker/ingest/20-supervisor.sh deleted: docker/ingest/20-xdebug.ini deleted: docker/ingest/queue-worker.conf deleted: sandd.code-workspace deleted: scripts/artisan.sh deleted: scripts/bash.sh deleted: scripts/composer.sh deleted: scripts/docker.sh deleted: scripts/init.sh deleted: scripts/npm.sh
2 years ago · 7b14912c53
24 changed files with 350 additions and 384 deletions
--- a/Dockerfile.core
+++ b/Dockerfile.core
@ -0,0 +1,138 @@
+# From here we will move the composer binary
+FROM composer:1.10 AS composer
+
+# Download base image ubuntu 20.04
+FROM ubuntu:20.04
+
+# Changing sh shell to bash
+SHELL ["/bin/bash", "-c", "-o", "pipefail"]
+
+# Change working directory
+WORKDIR /var/www/html
+
+# Disable Prompt During Packages Installation
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Prepare NodeJS
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash -
+
+# Prepare Yarn
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl && \
+    rm -rf /var/lib/apt/lists/* && \
+    curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+# Install Apache, NodeJS, PHP7.4-FPM, Supervisor
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+    apache2 \
+    apache2-doc \
+    apache2-utils \
+    git \
+    libapache2-mod-fcgid \
+    nodejs \
+	php7.4 \
+	php7.4-calendar \
+	php7.4-common \
+	php7.4-fileinfo \
+	php7.4-ftp \
+	php7.4-fpm \
+	php7.4-gettext \
+	php7.4-iconv \
+	php7.4-json \
+	php7.4-mbstring \
+	php7.4-opcache \
+	php7.4-pdo \
+	php7.4-phar \
+	php7.4-posix \
+	php7.4-readline \
+	php7.4-sockets \
+	php7.4-sqlite3 \
+	php7.4-tokenizer \
+	php7.4-xml \
+    php7.4-zip \
+    supervisor \
+    yarn && \
+    rm -rf /var/lib/apt/lists/*
+
+# Configure packages
+RUN a2enmod rewrite actions fcgid alias proxy_fcgi setenvif remoteip && \
+    a2enconf php7.4-fpm && \
+    bash -c 'echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf' && \
+    sed -i "s/LogFormat \"%v:%p %h/LogFormat \"%v:%p %a/g" /etc/apache2/apache2.conf && \
+    sed -i "s/LogFormat \"%h/LogFormat \"%a/g" /etc/apache2/apache2.conf && \
+    sed -i "s/AllowOverride None/AllowOverride All/g" /etc/apache2/apache2.conf && \
+    mkdir -p /run/php && \
+    mkdir -p /var/run/apache2 && \
+    mkdir -p /var/lock/apache2 && \
+    mkdir -p /var/log/supervisor && \
+    chown -R www-data:www-data /var/www/html && \
+    chown -R www-data:www-data /run/php && \
+    rm /var/www/html/index.html
+
+
+# Update NPM to last version
+RUN npm i -g npm
+
+# Install Duckling
+RUN apt-get update -y && \
+    apt-get -y install --no-install-recommends \
+	    libpcre3 \
+	    libpcre3-dev \
+	    pkg-config && \
+    git clone https://github.com/facebook/duckling.git fb-duckling && \
+    curl -sSL https://get.haskellstack.org/ | sh && \
+    rm -rf /var/lib/apt/lists/* && \
+    cd fb-duckling && \
+    stack build
+
+# This is a laravel application, change DocRoot
+RUN sed -i 's/\/var\/www\/html/&\/public/g' /etc/apache2/sites-available/000-default.conf
+
+
+# Expose environment variables
+RUN sed -i 's/;clear_env = .*/clear_env = no/g' /etc/php/*/fpm/pool.d/www.conf
+
+# Prepare Supervisor
+RUN mkdir /var/log/queue
+
+# Move configuraton files
+COPY conf/supervisord_core.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Move repository
+COPY --chown=www-data:www-data searchanddisplace-core/ .
+
+# Here we do the magic!
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
+# Install PHP Dependencies
+RUN composer install --no-progress
+
+# Generate key
+RUN php artisan key:generate
+
+# Install JS Dependencies
+RUN rm -rf node_modules && \
+    npm install && \
+    npm run production
+
+# Migrate Database
+RUN touch ./database/database.sqlite && \
+    chown www-data:www-data ./database/database.sqlite && \
+    php artisan migrate
+
+# Expose Port for the Application 
+EXPOSE 80 443
+
+# Copy start.sh script and define default command for the container
+CMD ["/usr/bin/supervisord"]
+
+
--- a/Dockerfile.ingest
+++ b/Dockerfile.ingest
@ -0,0 +1,130 @@
+# From here we will move the composer binary
+FROM composer:1.10 AS composer
+
+# Download base image ubuntu 20.04
+FROM ubuntu:20.04
+
+# Changing sh shell to bash
+SHELL ["/bin/bash", "-c", "-o", "pipefail"]
+
+# Change working directory
+WORKDIR /var/www/html
+
+# Disable Prompt During Packages Installation
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install Apache, PHP7.4-FPM, Supervisor
+RUN apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+    apache2 \
+    apache2-doc \
+    apache2-utils \
+    ca-certificates \
+    curl \
+    git \
+    libapache2-mod-fcgid \
+	php7.4 \
+	php7.4-common \
+	php7.4-fpm \
+	php7.4-mbstring \
+	php7.4-xml \
+    php7.4-zip \
+    software-properties-common \
+    supervisor && \
+    rm -rf /var/lib/apt/lists/*
+
+# Configure packages
+RUN a2enmod rewrite actions fcgid alias proxy_fcgi setenvif remoteip && \
+    a2enconf php7.4-fpm && \
+    bash -c 'echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf' && \
+    sed -i "s/LogFormat \"%v:%p %h/LogFormat \"%v:%p %a/g" /etc/apache2/apache2.conf && \
+    sed -i "s/LogFormat \"%h/LogFormat \"%a/g" /etc/apache2/apache2.conf && \
+    sed -i "s/AllowOverride None/AllowOverride All/g" /etc/apache2/apache2.conf && \
+    mkdir -p /run/php && \
+    mkdir -p /var/run/apache2 && \
+    mkdir -p /var/lock/apache2 && \
+    mkdir -p /var/log/supervisor && \
+    chown -R www-data:www-data /var/www/html && \
+    chown -R www-data:www-data /run/php && \
+    rm /var/www/html/index.html
+
+# This is a laravel application, change DocRoot
+RUN sed -i 's/\/var\/www\/html/&\/public/g' /etc/apache2/sites-available/000-default.conf
+
+
+# Expose environment variables
+RUN sed -i 's/;clear_env = .*/clear_env = no/g' /etc/php/*/fpm/pool.d/www.conf
+
+# Install LibreOffice
+RUN apt-get update -y && \
+    apt-add-repository -y ppa:libreoffice/ppa && \
+    apt-get update -y && \
+    apt-get install -y libreoffice
+
+# Install Python3
+RUN apt-get update -y && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository -y ppa:deadsnakes/ppa && \
+    apt-get install -y \
+        build-essential \
+	    libpoppler-cpp-dev \
+	    pkg-config \
+        python3 \
+        python3-dev
+
+# Install PDF Convertor
+RUN apt-get update -y && \
+    apt-get install -y \
+    libpoppler-cpp-dev \
+    poppler-utils
+
+# Install Tesseract OCR, Pandoc, DOCX to PDF Convertor, Unpaper
+RUN apt-get update -y && \
+    add-apt-repository -y ppa:alex-p/tesseract-ocr-devel && \
+    apt-get update -y && \
+    apt-get install -y \
+        pandoc \
+        tesseract-ocr \
+        unoconv \
+        unpaper
+
+# Install Pip
+RUN apt-get update -y && \
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+    python3 get-pip.py && \
+    rm -rf get-pip.py && \
+    pip3 install --upgrade pip
+
+# Install PdfToText
+RUN pip3 install pdftotext
+
+# Prepare Supervisor
+RUN mkdir /var/log/queue
+
+## Install Dewarp
+WORKDIR /var/www/html/resources/python/dewarp
+RUN pip3 install opencv-python
+WORKDIR /var/www/html
+
+# Move configuraton files
+COPY conf/supervisord_ingest.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Move repository
+COPY --chown=www-data:www-data searchanddisplace-ingest/ .
+
+# Here we do the magic!
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+
+# Install PHP Dependencies
+RUN composer install
+
+# Generate key
+RUN php artisan key:generate
+
+# Expose Port for the Application 
+EXPOSE 80 443
+
+# Copy start.sh script and define default command for the container
+CMD ["/usr/bin/supervisord"]
+
+
--- a/73
+++ b/73
@ -1,73 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
-
-     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
-
-     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
-
-     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
-
-     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
-
-     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--- a/README.md
+++ b/README.md
@ -1,8 +0,0 @@
-# A docker container configuration for search and displace
-
-## Initialize the repository
-In order to be able to run this application, its submodules first need to be initialized. To do this, after cloning, run the following commands in the root directory:
- - `git submodule init`
- - `git submodule update`
-
-After that, the files in `docker/conf/nginx/templates` need to be edited with the corresponding URLs. The `server_name`s need to be added in the operating system's hosts file so they work locally.
--- a/ReadMe.md
+++ b/ReadMe.md
@ -0,0 +1,20 @@
+# A docker container configuration for search and displace
+
+### Initialization steps
+1.  Initialize the repositories
+```
+git submodule init
+git submodule update
+```
+
+2. Copy *.env.example* renaming it to *.env*
+```
+cp searchanddisplace-core/.env.example searchanddisplace-core/.env
+cp searchanddisplace-ingest/.env.example searchanddisplace-ingest/.env
+```
+
+3. Manually configure the two environment files from the **searchanddisplace-core** and **searchanddisplace-ingest** folders
+- REDIS_HOST: search-and-display-redis
+- SD_INGEST_URL:  http://search-and-display-ingest/ingest
+- WEBHOOK_CORE_URL=http://search-and-display-core
+
--- a/conf/supervisord_core.conf
+++ b/conf/supervisord_core.conf
@ -0,0 +1,29 @@
+[supervisord]
+nodaemon=true
+
+[program:php7.4-fpm]
+command=/usr/sbin/php-fpm7.4 --nodaemonize --fpm-config /etc/php/7.4/fpm/php-fpm.conf
+
+[program:queue-worker-search-and-displace-core-production]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:listen --queue=sd_core,default --tries=2 --timeout=180
+autostart=true
+autorestart=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stdout_logfile=/var/log/queue/queue-worker-search-and-displace-core-production.log
+
+[program:duckling-worker]
+process_name=%(program_name)s_%(process_num)02d
+directory=/var/www/html/fb-duckling
+command=stack exec duckling-example-exe
+autostart=true
+autorestart=true
+user=root
+numprocs=1
+redirect_stderr=true
+stdout_logfile=/var/log/queue/duckling.log
+
+[program:apache2]
+command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
--- a/conf/supervisord_ingest.conf
+++ b/conf/supervisord_ingest.conf
@ -0,0 +1,19 @@
+[supervisord]
+nodaemon=true
+
+[program:php7.4-fpm]
+command=/usr/sbin/php-fpm7.4 --nodaemonize --fpm-config /etc/php/7.4/fpm/php-fpm.conf
+
+[program:apache2]
+command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFOREGROUND"
+
+[program:queue-worker-search-and-displace-ingest-production]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:listen --queue=sd_ingest,default --tries=2 --timeout=180
+autostart=true
+autorestart=true
+user=www-data
+numprocs=3
+redirect_stderr=true
+stdout_logfile=/var/log/queue/queue-worker-search-and-displace-ingest-production.log
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,97 +2,30 @@ version: '3'
 services:
    core:
        build:
-            context: ./docker/core
-            dockerfile: Dockerfile
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
-        volumes:
-            - './docker/core/20-supervisor.sh:/docker-entrypoint.d/20-supervisor.sh'
-            - './docker/core/duckling-worker.conf:/etc/supervisor/conf.d/duckling-worker.conf'
-            - './docker/core/queue-worker.conf:/etc/supervisor/conf.d/queue-worker.conf'
-            - './searchanddisplace-core:/var/www/core'
-        environment:
-            NGINX_ENVSUBST_TEMPLATE_SUFFIX: '${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.conf}'
-            SERVER_ROOT: '/var/www/core'
-            SERVER_NAME: 'core.sandd'
-        container_name: sandd_core
-        networks:
-            - sandd
-        expose:
-            - 9003
+            context: .
+            dockerfile: Dockerfile.core
+        container_name: search-and-display-core
+        ports:
+            - "80:80"
+            - "443:443"
        depends_on:
-            - redis
+            - ingest

    ingest:
        build:
-            context: ./docker/ingest
-            dockerfile: Dockerfile
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
-        volumes:
-            - './docker/ingest/20-xdebug.ini:/etc/php/7.4/fpm/conf.d/20-xdebug.ini'
-            - './docker/ingest/20-supervisor.sh:/docker-entrypoint.d/20-supervisor.sh'
-            - './docker/ingest/queue-worker.conf:/etc/supervisor/conf.d/queue-worker.conf'
-            - './searchanddisplace-ingest:/var/www/ingest'
-        environment:
-            NGINX_ENVSUBST_TEMPLATE_SUFFIX: '${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.conf}'
-            SERVER_ROOT: '/var/www/ingest'
-            SERVER_NAME: 'ingest.sandd'
-        container_name: sandd_ingest
-        networks:
-            - sandd
+            context: .
+            dockerfile: Dockerfile.ingest
+        container_name: search-and-display-ingest
        expose:
-            - 9004
+            - 80
        depends_on:
            - redis

-    nginx:
-        image: 'nginx:alpine'
-        container_name: sandd_nginx
-        volumes:
-            - './docker/conf/nginx/nginx.conf:/etc/nginx/nginx.conf'
-            - './docker/conf/nginx/templates:/etc/nginx/templates'
-            - './docker/cert:/etc/cert'
-        environment:
-            NGINX_ENVSUBST_TEMPLATE_SUFFIX: '${NGINX_ENVSUBST_TEMPLATE_SUFFIX}'
-        ports:
-            - 80:80
-            - 443:443
-        networks:
-            - sandd
-        depends_on:
-            - core
-            - ingest
-
    redis:
        image: "redis:alpine"
-        container_name: sandd_redis
-        command: redis-server --requirepass sandd
-        ports:
-            - "6379:6379"
-        volumes:
-            - $PWD/docker/redis/data:/var/lib/redis
-            - $PWD/docker/redis/redis.conf:/usr/local/etc/redis/redis.conf
+        container_name: search-and-display-redis
+        expose:
+            - 6379
        environment:
            - REDIS_REPLICATION_MODE=master
-        networks:
-            - sandd
-
-    redis-commander:
-        image: rediscommander/redis-commander:latest
-        container_name: sandd_redis_commander
-        environment:
-            - REDIS_HOSTS=sandd:redis:6379:1:sandd
-            - HTTP_USER=root
-            - HTTP_PASSWORD=sandd
-        ports:
-            - 8081:8081
-        depends_on:
-            - redis
-        networks:
-            - sandd
-

-networks:
-    sandd:
-        driver: bridge
--- a/docker/conf/nginx/nginx.conf
+++ b/docker/conf/nginx/nginx.conf
@ -1,35 +0,0 @@
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    fastcgi_buffers 8 16k;
-    fastcgi_buffer_size 32k;
-    fastcgi_connect_timeout 90;
-    fastcgi_send_timeout 90;
-    fastcgi_read_timeout 90;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    include /etc/nginx/conf.d/*.conf;
-}
--- a/docker/conf/nginx/templates/default.conf.conf
+++ b/docker/conf/nginx/templates/default.conf.conf
@ -1,21 +0,0 @@
-server {
-    listen 80;
-    server_name core.sandd;
-
-    location / {
-        proxy_pass http://sandd_core/;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-    }
-}
-
-server {
-    listen 80;
-    server_name ingest.sandd;
-
-    location / {
-        proxy_pass http://sandd_ingest/;
-        proxy_http_version 1.1;
-        proxy_set_header Connection "";
-    }
-}
--- a/docker/core/20-supervisor.sh
+++ b/docker/core/20-supervisor.sh
@ -1,5 +0,0 @@
-#!/bin/sh
-
-systemctl enable supervisor;
-service supervisor start;
-supervisorctl start all;
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@ -1,39 +0,0 @@
-FROM rcarjan/nginx-php:7.4
-
-LABEL maintainer="Radu Liviu Carjan"
-
-## Make queue log directory
-RUN mkdir /var/log/queue
-
-WORKDIR /var/www
-
-## Install libreoffice
-RUN apt-get install -y software-properties-common && \
-    apt-add-repository -y ppa:libreoffice/ppa && \
-    apt-get install -y \
-    libreoffice \
-    supervisor \
-    sqlite3 \
-    php7.4-sqlite3
-
-RUN mkdir /var/www/duckling
-ADD duckling /var/www/duckling
-
-## Install duckling prerequisites
-RUN  apt-get update && \
-    apt-get install -y \
-    libpcre3 \
-    libpcre3-dev \
-    pkg-config \
-    git
-
-## Change workdir to duckling folder
-WORKDIR /var/www/duckling
-
-## Install haskell stack
-RUN curl -sSL https://get.haskellstack.org/ | sh
-
-## Install duckling
-RUN stack build
-
-WORKDIR ${SERVER_ROOT}
--- a/docker/core/duckling-worker.conf
+++ b/docker/core/duckling-worker.conf
@ -1,10 +0,0 @@
-[program:duckling-worker]
-process_name=%(program_name)s_%(process_num)02d
-directory=/var/www/duckling
-command=stack exec duckling-example-exe
-autostart=true
-autorestart=true
-user=root
-numprocs=1
-redirect_stderr=true
-stdout_logfile=/var/log/queue/duckling.log
--- a/docker/core/queue-worker.conf
+++ b/docker/core/queue-worker.conf
@ -1,9 +0,0 @@
-[program:queue-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/core/artisan queue:listen --queue=sd_core,default --tries=2 --timeout=180
-autostart=true
-autorestart=true
-user=www-data
-numprocs=3
-redirect_stderr=true
-stdout_logfile=/var/log/queue/queues.log
--- a/docker/ingest/20-supervisor.sh
+++ b/docker/ingest/20-supervisor.sh
@ -1,5 +0,0 @@
-#!/bin/sh
-
-systemctl enable supervisor;
-service supervisor start;
-supervisorctl start all;
--- a/docker/ingest/20-xdebug.ini
+++ b/docker/ingest/20-xdebug.ini
@ -1,10 +0,0 @@
-zend_extension=xdebug
-
-[xdebug]
-xdebug.mode=debug
-xdebug.client_port=9004
-xdebug.start_with_request = yes
-xdebug.client_host=host.docker.internal
-xdebug.idekey = VSCODE
-xdebug.log=/tmp/xdebug.log
-xdebug.log_level=10
--- a/docker/ingest/queue-worker.conf
+++ b/docker/ingest/queue-worker.conf
@ -1,9 +0,0 @@
-[program:queue-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=php /var/www/ingest/artisan queue:listen --queue=sd_ingest,default --tries=2 --timeout=180
-autostart=true
-autorestart=true
-user=www-data
-numprocs=3
-redirect_stderr=true
-stdout_logfile=/var/log/queue/queues.log
--- a/sandd.code-workspace
+++ b/sandd.code-workspace
@ -1,42 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {},
-	"launch": {
-		"version": "0.2.0",
-		"configurations": [
-			{
-				"name": "[DEBUG] Core",
-				"type": "php",
-				"request": "launch",
-				"port": 9003,
-				"log": false,
-				"xdebugSettings": {
-					"show_hidden": 0,
-					"max_depth": 3
-				},
-				"pathMappings": {
-					"/var/www/core/": "${workspaceFolder}/searchanddisplace-core",
-				}
-			},
-
-			{
-				"name": "[DEBUG] Ingest",
-				"type": "php",
-				"request": "launch",
-				"port": 9004,
-				"log": false,
-				"xdebugSettings": {
-					"show_hidden": 0,
-					"max_depth": 3
-				},
-				"pathMappings": {
-					"/var/www/ingest/": "${workspaceFolder}/searchanddisplace-ingest",
-				}
-			}
-		]
-	}
-}
--- a/scripts/artisan.sh
+++ b/scripts/artisan.sh
@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-clear;
-docker compose -p sandd exec website php artisan $@
--- a/scripts/bash.sh
+++ b/scripts/bash.sh
@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-clear;
-docker compose -p sandd exec $@ /bin/bash
--- a/scripts/composer.sh
+++ b/scripts/composer.sh
@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-clear;
-
-if tty -s; then
-    echo 'Running composer in interactive mode.'
-    docker compose -p sandd exec website composer $@
-else
-    echo 'Running composer in non-interactive mode.'
-    docker compose -p sandd exec -T website composer $@
-fi
--- a/scripts/docker.sh
+++ b/scripts/docker.sh
@ -1,4 +0,0 @@
-#!/usr/bin/env zsh
-
-clear;
-docker compose -p sandd $@
--- a/scripts/init.sh
+++ b/scripts/init.sh
@ -1,5 +0,0 @@
-#!/usr/bin/env zsh
-
-rm -rf "$PWD/website/.env";
-# ln -s "$PWD/.env" "$PWD/api/.env";
-cp "$PWD/.env" "$PWD/website/.env";
--- a/scripts/npm.sh
+++ b/scripts/npm.sh
@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-clear;
-
-container="website"
-dir="/var/www/website/"
-
-
-docker compose -p sandd exec -w ${dir} ${container} npm $@ -unsafe-perm;