Popravki dockerja - odstranjene odvecne datoteke
This commit is contained in:
pero1203
parent
ff0c2391c1
commit
d4cbfc7599
@ -1,31 +0,0 @@
|
||||
FROM php:7.2-apache-buster
|
||||
|
||||
# Apache packages
|
||||
RUN apt-get update -y \
|
||||
&& apt-get upgrade -y \
|
||||
&& apt-get install -y \
|
||||
libgd-dev \
|
||||
libfreetype6-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libpng-dev \
|
||||
libxml2-dev \
|
||||
zlib1g-dev \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# PHP configure freetype
|
||||
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
|
||||
|
||||
# PHP modules
|
||||
RUN /usr/local/bin/docker-php-ext-install \
|
||||
mysqli \
|
||||
pdo \
|
||||
pdo_mysql \
|
||||
bcmath \
|
||||
soap \
|
||||
gd \
|
||||
zip
|
||||
|
||||
# Enable rewrite module
|
||||
RUN a2enmod rewrite
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
FROM php:7.2-apache-buster
|
||||
|
||||
# Apache packages
|
||||
RUN apt-get update -y \
|
||||
&& apt-get upgrade -y \
|
||||
&& apt-get install -y \
|
||||
libgd-dev \
|
||||
libfreetype6-dev \
|
||||
libjpeg62-turbo-dev \
|
||||
libpng-dev \
|
||||
libxml2-dev \
|
||||
zlib1g-dev \
|
||||
texlive-full \
|
||||
latex2rtf \
|
||||
&& apt-get clean \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# PHP configure freetype
|
||||
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
|
||||
|
||||
# PHP modules
|
||||
RUN /usr/local/bin/docker-php-ext-install \
|
||||
mysqli \
|
||||
pdo \
|
||||
pdo_mysql \
|
||||
bcmath \
|
||||
soap \
|
||||
gd \
|
||||
zip
|
||||
|
||||
# Enable rewrite module
|
||||
RUN a2enmod rewrite
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
FROM rocker/r-base:latest
|
||||
|
||||
|
||||
## install debian packages
|
||||
RUN apt-get update -qq \
|
||||
&& apt-get -y --no-install-recommends install \
|
||||
libxml2-dev \
|
||||
libcairo2-dev \
|
||||
libsqlite3-dev \
|
||||
libmariadbd-dev \
|
||||
libpq-dev \
|
||||
libssh2-1-dev \
|
||||
unixodbc-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libssl-dev
|
||||
|
||||
|
||||
## Kopiramo datoteko z R paketi
|
||||
#COPY packages.R /packages.R
|
||||
|
||||
## Poženemo datoteko z R paketi da se naložijo
|
||||
#RUN Rscript /install_packages.R
|
||||
|
||||
|
||||
RUN R -e "install.packages('shiny',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
RUN R -e "install.packages('esquisse',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('Cairo',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('cowplot',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('data.table',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('flextable',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('ggplot2',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('fmsb',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('grid',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('gridExtra',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('Hmisc',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('janitor',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('magrittr',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('matrixStats',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('openxlsx',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('plotrix',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('plyr',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('Rcpp',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('reports',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('reshape',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('scales',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('TeachingDemos',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('tools',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('dplyr',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('car',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('plyr',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
#RUN R -e "install.packages('ReporteRsjars',dependencies=TRUE, repos='http://cran.rstudio.com/')"
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
|
||||
www:
|
||||
container_name: www_1ka
|
||||
restart: always
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
depends_on:
|
||||
- mysql
|
||||
ports:
|
||||
- "80:80"
|
||||
volumes:
|
||||
- ../../:/var/www/html/
|
||||
- ./www/config/php-7.2.ini:/usr/local/etc/php/php.ini
|
||||
- ./www/config/php-local.ini:/usr/local/etc/php/conf.d/local.ini
|
||||
- ./www/config/1ka.test:/etc/apache2/sites-available/1ka.test
|
||||
- ./www/log/:/var/log/apache2/
|
||||
networks:
|
||||
- default
|
||||
|
||||
mysql:
|
||||
container_name: mysql_1ka
|
||||
image: mysql:5.6.40
|
||||
ports:
|
||||
- "3306:3306"
|
||||
volumes:
|
||||
- ./sql/database:/var/lib/mysql
|
||||
- ./sql/log:/var/log/mysql
|
||||
- ./sql/config:/etc/mysql/conf.d
|
||||
networks:
|
||||
- default
|
||||
environment:
|
||||
- MYSQL_USER=root
|
||||
- MYSQL_ROOT_PASSWORD=1234
|
||||
- MYSQL_PASSWORD=1234
|
||||
- MYSQL_DATABASE=1ka
|
||||
- MYSQL_ALLOW_EMPTY_PASSWORD=true
|
||||
@ -1,17 +1,15 @@
|
||||
version: "3"
|
||||
|
||||
networks:
|
||||
1ka:
|
||||
|
||||
services:
|
||||
|
||||
www_full:
|
||||
build: .
|
||||
container_name: www_1ka_full
|
||||
www:
|
||||
container_name: www_1ka
|
||||
restart: always
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
depends_on:
|
||||
- mysql
|
||||
# - rscript
|
||||
ports:
|
||||
- "80:80"
|
||||
volumes:
|
||||
@ -21,13 +19,11 @@ services:
|
||||
- ./www/config/1ka.test:/etc/apache2/sites-available/1ka.test
|
||||
- ./www/log/:/var/log/apache2/
|
||||
networks:
|
||||
- 1ka
|
||||
- default
|
||||
|
||||
mysql:
|
||||
image: mysql:5.6.40
|
||||
container_name: mysql_1ka
|
||||
restart: unless-stopped
|
||||
tty: true
|
||||
image: mysql:5.6.40
|
||||
ports:
|
||||
- "3306:3306"
|
||||
volumes:
|
||||
@ -35,34 +31,17 @@ services:
|
||||
- ./sql/log:/var/log/mysql
|
||||
- ./sql/config:/etc/mysql/conf.d
|
||||
networks:
|
||||
- 1ka
|
||||
- default
|
||||
environment:
|
||||
- MYSQL_USER=root
|
||||
- MYSQL_ROOT_PASSWORD=1234
|
||||
- MYSQL_PASSWORD=1234
|
||||
- MYSQL_DATABASE=1ka
|
||||
- MYSQL_ALLOW_EMPTY_PASSWORD=true
|
||||
|
||||
# Ukaž poženemo z docker run --rm -it -v ${PWD}:/data laurenss/texlive-full pdflatex filename.tex
|
||||
# latex:
|
||||
# container_name: latex_1ka
|
||||
# image: laurenss/texlive-full:latest
|
||||
# volumes:
|
||||
# - ../../:/data/
|
||||
# networks:
|
||||
# - 1ka
|
||||
|
||||
# rscript:
|
||||
# container_name: rscript_1ka
|
||||
# build:
|
||||
# context: .
|
||||
# dockerfile: R/Dockerfile_R
|
||||
# networks:
|
||||
# - 1ka
|
||||
- MYSQL_ALLOW_EMPTY_PASSWORD=true
|
||||
|
||||
phpmyadmin:
|
||||
image: phpmyadmin/phpmyadmin:latest
|
||||
container_name: phpmyadmin_1ka
|
||||
image: phpmyadmin/phpmyadmin
|
||||
depends_on:
|
||||
- mysql
|
||||
ports:
|
||||
@ -70,9 +49,7 @@ services:
|
||||
environment:
|
||||
- PMA_HOST=mysql
|
||||
- PMA_PORT=3306
|
||||
volumes:
|
||||
- ./www/config/php-7.2.ini:/usr/local/etc/php/conf.d/php-phpmyadmin.ini
|
||||
networks:
|
||||
- 1ka
|
||||
|
||||
- default
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user