Compare commits

..

No commits in common. "bbb878ae078c0f3e351199e4b19aa0353f47384d" and "9aebdbc1a313c12c05876794650c13ca994ab624" have entirely different histories.

4 changed files with 55 additions and 6 deletions

9
Jenkinsfile vendored
View File

@ -13,9 +13,8 @@ pipeline {
} }
agent { agent {
dockerfile { dockerfile {
filename 'docker/Dockerfile' filename 'docker/Dockerfile-test'
dir '.' dir '.'
additionalBuildArgs '--target mapg_base'
reuseNode true reuseNode true
} }
} }
@ -27,9 +26,8 @@ pipeline {
stage('Unit Testing') { stage('Unit Testing') {
agent { agent {
dockerfile { dockerfile {
filename 'docker/Dockerfile' filename 'docker/Dockerfile-test'
dir '.' dir '.'
additionalBuildArgs '--target mapg_base'
reuseNode true reuseNode true
} }
} }
@ -46,9 +44,8 @@ pipeline {
stage('Static Code Analysis') { stage('Static Code Analysis') {
agent { agent {
dockerfile { dockerfile {
filename 'docker/Dockerfile' filename 'docker/Dockerfile-test'
dir '.' dir '.'
additionalBuildArgs '--target mapg_base'
reuseNode true reuseNode true
} }
} }

30
docker/Dockerfile-app Normal file
View File

@ -0,0 +1,30 @@
FROM ubuntu:focal
ENV DEBIAN_FRONTEND noninteractive
# Install Nginx, PHP and further necessary packages
RUN apt update --fix-missing
RUN apt install -y curl git unzip mariadb-client nginx \
php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
# Configure Nginx with PHP
RUN mkdir -p /run/php
COPY configs/nginx.conf /etc/nginx/sites-available/default
RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini
RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini
RUN echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
# Install Composer
COPY scripts/install-composer.sh install-composer.sh
RUN ./install-composer.sh
# Install Node.js and required packages
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt install -y nodejs
RUN npm install -g uglify-js clean-css-cli svgo yarn
EXPOSE 80
VOLUME /var/www/mapguesser
WORKDIR /var/www/mapguesser
ENTRYPOINT /usr/sbin/php-fpm7.4 -F & /usr/sbin/nginx -g 'daemon off;'

16
docker/Dockerfile-multi Normal file
View File

@ -0,0 +1,16 @@
FROM ubuntu:focal
ENV DEBIAN_FRONTEND noninteractive
# Install necessary packages
RUN apt update --fix-missing
RUN apt install -y curl build-essential
# Install Node.js and required packages
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt install -y nodejs
VOLUME /var/www/mapguesser
WORKDIR /var/www/mapguesser
ENTRYPOINT /usr/bin/node --inspect=0.0.0.0:9229 multi

6
docker/Dockerfile-test Normal file
View File

@ -0,0 +1,6 @@
FROM ubuntu:focal
ENV DEBIAN_FRONTEND noninteractive
RUN apt update && apt install -y curl git unzip php7.4-cli php7.4-mbstring php7.4-xml
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer