From 0660b7908a9c124a0b4d80ed4db71c9cee863fbf Mon Sep 17 00:00:00 2001 From: Ray Becker Date: Mon, 4 Jul 2022 15:03:36 +0100 Subject: [PATCH 1/2] Add files via upload I'm adding a Dockerfile with the php version for AIFdb, because I know that it needs an older version, but the latest versions of nodejs and alpine, and also the requirements.txt file that's needed for NOOP. --- Dockerfile | 22 ++++++++++++++++++++++ requirements.txt | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 Dockerfile create mode 100644 requirements.txt diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..688426c3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM php:5.6-apache +FROM node:16.15-alpine3.14 +FROM python:3 + +RUN mkdir -p /home/ova3-main +WORKDIR /home/ova3-main + +RUN set -xe \ + && apt-get update -y \ + && apt-get install -y python3-pip +RUN pip3 install --upgrade pip + +ADD requirements.txt . +RUN pip install -r requirements.txt + +ADD app app +ADD routes.py . + +ENV FLASK_APP app + +EXPOSE 3000 +ENTRYPOINT python routes.py \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..77cac9b8 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +Flask==2.0.3 +requests==2.23.0 +wget==3.2.0 \ No newline at end of file From b69151bbdae58c5a04da86b0b4e30f94cff62ff9 Mon Sep 17 00:00:00 2001 From: Ray Becker Date: Sat, 20 Aug 2022 06:08:11 +0200 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 688426c3..dab2c917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,9 @@ FROM php:5.6-apache -FROM node:16.15-alpine3.14 -FROM python:3 - -RUN mkdir -p /home/ova3-main -WORKDIR /home/ova3-main - -RUN set -xe \ - && apt-get update -y \ - && apt-get install -y python3-pip -RUN pip3 install --upgrade pip - -ADD requirements.txt . -RUN pip install -r requirements.txt - -ADD app app -ADD routes.py . - -ENV FLASK_APP app - -EXPOSE 3000 -ENTRYPOINT python routes.py \ No newline at end of file +ADD ova3 /var/www/html/ +RUN mkdir /var/www/html/tmp +RUN chmod 777 /var/www/html/tmp +RUN a2enmod rewrite +RUN a2enmod headers +COPY php.ini /usr/local/etc/php/ +RUN docker-php-ext-install mysql mysqli pdo pdo_mysql +RUN apt-get update && apt-get install -y mysql-client