Merge pull request #66 from sergiolaverde0/dockerfile-refactor

Dockerfile refactor
simjanos-dev · Jan 15, 2024 · b553867 · b553867
2 parents b1af8c3 + b490914
commit b553867
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 66 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 name: linguacafe
 
 networks:
@@ -28,15 +28,15 @@ services:
         restart: unless-stopped
         tty: true
         ports:
-          - "3308:3306"
+            - "3308:3306"
         volumes:
-          - /your/linguacafe/database/folder:/var/lib/mysql
+            - /your/linguacafe/database/folder:/var/lib/mysql
         environment:
-          MYSQL_DATABASE: linguacafe
-          MYSQL_USER: linguacafe
-          MYSQL_PASSWORD: linguacafe
-          MYSQL_ROOT_PASSWORD: linguacafe
-          SERVICE_NAME: linguacafe
+            MYSQL_DATABASE: linguacafe
+            MYSQL_USER: linguacafe
+            MYSQL_PASSWORD: linguacafe
+            MYSQL_ROOT_PASSWORD: linguacafe
+            SERVICE_NAME: linguacafe
         healthcheck:
             test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
             interval: 15s

diff --git a/docker/PhpDockerfile b/docker/PhpDockerfile
@@ -1,51 +1,53 @@
 FROM php:8.2-apache
 
-RUN curl -sL https://deb.nodesource.com/setup_14.x -o nodesource_setup.sh
-RUN chmod +x ./nodesource_setup.sh
-RUN ./nodesource_setup.sh
-RUN rm ./nodesource_setup.sh
-RUN apt install nodejs npm -y
+RUN curl -sL https://deb.nodesource.com/setup_14.x -o nodesource_setup.sh \
+    && chmod +x ./nodesource_setup.sh \
+    && ./nodesource_setup.sh \
+    && rm ./nodesource_setup.sh
 
-# install php extensions for laravel
-RUN apt update
-RUN apt install -y sqlite3
-RUN docker-php-ext-install pdo pdo_mysql fileinfo
-RUN apt install -y \
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y \
+        curl \
+        libonig-dev \
         libpng-dev \
-        zlib1g-dev \
         libxml2-dev \
         libzip-dev \
-        libonig-dev \
-        zip \
-        curl \
+        nodejs \
+        npm \
+        sqlite3 \
         unzip \
+        zip \
+        zlib1g-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# install php extensions for laravel
+RUN docker-php-ext-install pdo pdo_mysql fileinfo \
     && docker-php-ext-configure gd \
-    && docker-php-ext-install -j$(nproc) gd \
+    && docker-php-ext-install "-j$(nproc)" gd \
     && docker-php-ext-install pdo_mysql \
     && docker-php-ext-install mysqli \
     && docker-php-ext-install zip \
     && docker-php-source delete
 
 #php config
-RUN printf 'max_execution_time = 600\n' >> /usr/local/etc/php/conf.d/uploads.ini
-RUN printf 'upload_max_filesize = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini
-RUN printf 'post_max_size = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini
-RUN printf 'memory_limit = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini
+RUN printf 'max_execution_time = 600\n' >> /usr/local/etc/php/conf.d/uploads.ini \
+    && printf 'upload_max_filesize = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini \
+    && printf 'post_max_size = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini \
+    && printf 'memory_limit = 500M\n' >> /usr/local/etc/php/conf.d/uploads.ini
 
 # copy apache config
 COPY ./docker/vhost.conf /etc/apache2/sites-available/000-default.conf
 
 COPY ./ /var/www/html
 
 # set project directory owner
-RUN chown -R www-data:www-data /var/www/html
-
-# enable htaccess
-RUN a2enmod rewrite
-
-# install composer
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN chown -R www-data:www-data /var/www/html \
+    # enable htaccess
+    && a2enmod rewrite \
+    # install composer
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 # for some reason i have to install this manually,
 # despite being in the composer.json

diff --git a/docker/PythonDockerfile b/docker/PythonDockerfile
@@ -1,40 +1,40 @@
 FROM ubuntu:22.04
 
 WORKDIR /app
-RUN apt clean
-RUN apt update -y
-
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        python3 \
+        pip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pip install -U --no-cache-dir \
+        setuptools \
+        wheel \
 #youtube api
-RUN apt install python3 -y
-RUN apt install pip -y
-RUN pip install youtube_transcript_api
-
+        youtube_transcript_api \
 #ebook library
-RUN pip install ebooklib
-
-#spacy
-RUN pip install -U pip setuptools wheel
-RUN pip install -U spacy
-RUN python3 -m spacy download ja_core_news_sm
-RUN python3 -m spacy download ko_core_news_sm
-RUN python3 -m spacy download de_core_news_sm
-RUN python3 -m spacy download nb_core_news_sm
-RUN python3 -m spacy download es_core_news_sm
-RUN python3 -m spacy download zh_core_web_sm
-RUN python3 -m spacy download nl_core_news_sm
-RUN python3 -m spacy download fi_core_news_sm
-RUN python3 -m spacy download fr_core_news_sm
-RUN python3 -m spacy download it_core_news_sm
-RUN python3 -m spacy download ru_core_news_sm
-RUN python3 -m spacy download sv_core_news_sm
-RUN python3 -m spacy download uk_core_news_sm
-
-
+        ebooklib \
 #pykakasi
-RUN pip install pykakasi
-
+        pykakasi \
 #django
-RUN pip install django
+        django \
+#spacy
+        spacy
+
+RUN python3 -m spacy download ja_core_news_sm \
+    && python3 -m spacy download ko_core_news_sm \
+    && python3 -m spacy download de_core_news_sm \
+    && python3 -m spacy download nb_core_news_sm \
+    && python3 -m spacy download es_core_news_sm \
+    && python3 -m spacy download zh_core_web_sm \
+    && python3 -m spacy download nl_core_news_sm \
+    && python3 -m spacy download fi_core_news_sm \
+    && python3 -m spacy download fr_core_news_sm \
+    && python3 -m spacy download it_core_news_sm \
+    && python3 -m spacy download ru_core_news_sm \
+    && python3 -m spacy download sv_core_news_sm \
+    && python3 -m spacy download uk_core_news_sm
 
 COPY ./tools/django_server /app