fmasa · Mar 13, 2022 · Jan 15, 2023 · Jan 15, 2023 · Apr 2, 2023 · Apr 2, 2023
diff --git a/build_and_push.sh b/build_and_push.sh
@@ -1,21 +1,27 @@
 #!/usr/bin/env bash
 
-docker build -t fmasa/lebeda:8.1 lebeda/8.1 --no-cache
-docker build -t fmasa/lebeda:8.1-ci lebeda/8.1-ci --no-cache
+docker build -t skaut/lebeda:8.3 lebeda/8.3 --no-cache
+docker build -t skaut/lebeda:8.3-ci lebeda/8.3-ci --no-cache
 
-docker build -t fmasa/lebeda:8.0 lebeda/8.0 --no-cache
-docker build -t fmasa/lebeda:8.0-ci lebeda/8.0-ci --no-cache
+docker build -t skaut/lebeda:8.2 lebeda/8.2 --no-cache
+docker build -t skaut/lebeda:8.2-ci lebeda/8.2-ci --no-cache
 
-docker build -t fmasa/lebeda:7.4 lebeda/7.4 --no-cache
-docker build -t fmasa/lebeda:7.4-ci lebeda/7.4-ci --no-cache
+docker build -t skaut/lebeda:8.1 lebeda/8.1 --no-cache
+docker build -t skaut/lebeda:8.1-ci lebeda/8.1-ci --no-cache
 
-docker build -t fmasa/lebeda:7.3 lebeda/7.3 --no-cache
-docker build -t fmasa/lebeda:7.3-ci lebeda/7.3-ci --no-cache
+docker build -t skaut/lebeda:8.0 lebeda/8.0 --no-cache
+docker build -t skaut/lebeda:8.0-ci lebeda/8.0-ci --no-cache
 
-docker build -t fmasa/lebeda:7.1 lebeda/7.1 --no-cache
-docker build -t fmasa/lebeda:7.1-ci lebeda/7.1-ci --no-cache
+docker build -t skaut/lebeda:7.4 lebeda/7.4 --no-cache
+docker build -t skaut/lebeda:7.4-ci lebeda/7.4-ci --no-cache
 
-docker build -t fmasa/firefox firefox --no-cache
-
-docker push fmasa/lebeda
-docker push fmasa/firefox
+docker push skaut/lebeda:8.3
+docker push skaut/lebeda:8.3-ci
+docker push skaut/lebeda:8.2
+docker push skaut/lebeda:8.2-ci
+docker push skaut/lebeda:8.1
+docker push skaut/lebeda:8.1-ci
+docker push skaut/lebeda:8.0
+docker push skaut/lebeda:8.0-ci
+docker push skaut/lebeda:7.4
+docker push skaut/lebeda:7.4-ci
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
diff --git a/firefox/README.md b/firefox/README.md
diff --git a/firefox/run.sh b/firefox/run.sh
diff --git a/lebeda/7.1-ci/Dockerfile b/lebeda/7.1-ci/Dockerfile
diff --git a/lebeda/7.1/Dockerfile b/lebeda/7.1/Dockerfile
diff --git a/lebeda/7.4-ci/Dockerfile b/lebeda/7.4-ci/Dockerfile
@@ -1,6 +1,4 @@
-FROM fmasa/lebeda:7.4
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM skaut/lebeda:7.4
 
 # Install build tools
 RUN apt-get update && apt-get install -y \

diff --git a/lebeda/7.4/Dockerfile b/lebeda/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4.3-apache
+FROM php:7.4.33-apache
 
 LABEL maintainer="frantisekmasa1@gmail.com"
 
@@ -23,7 +23,7 @@ RUN apt-get update \
 	    locales \
 	&& docker-php-ext-configure gd --with-freetype --with-jpeg \
 	&& docker-php-ext-install -j$(nproc) gd soap mysqli pdo pdo_mysql zip bcmath intl \
-	&& pecl install xdebug \
+	&& pecl install xdebug-3.1.5 \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Install Composer

diff --git a/lebeda/8.0-ci/Dockerfile b/lebeda/8.0-ci/Dockerfile
@@ -1,6 +1,4 @@
-FROM fmasa/lebeda:8.0
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM skaut/lebeda:8.0
 
 # Install build tools
 RUN apt-get update && apt-get install -y \

diff --git a/lebeda/8.0/Dockerfile b/lebeda/8.0/Dockerfile
@@ -1,6 +1,4 @@
-FROM php:8.0.11-apache
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM php:8.0.28-apache
 
 WORKDIR /var/www/html
 

diff --git a/lebeda/8.1-ci/Dockerfile b/lebeda/8.1-ci/Dockerfile
@@ -1,6 +1,4 @@
-FROM fmasa/lebeda:8.1
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM skaut/lebeda:8.1
 
 # Install build tools
 RUN apt-get update && apt-get install -y \

diff --git a/lebeda/8.1/Dockerfile b/lebeda/8.1/Dockerfile
@@ -1,6 +1,4 @@
-FROM php:8.1.0-apache
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM php:8.1.16-apache
 
 WORKDIR /var/www/html
 

diff --git a/lebeda/7.3-ci/Dockerfile → lebeda/8.2-ci/Dockerfile b/lebeda/7.3-ci/Dockerfile → lebeda/8.2-ci/Dockerfile
@@ -1,6 +1,4 @@
-FROM fmasa/lebeda:7.3
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM skaut/lebeda:8.2
 
 # Install build tools
 RUN apt-get update && apt-get install -y \
@@ -20,7 +18,7 @@ RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add -
 	    fonts-thai-tlwg \
 	    fonts-kacst \
 	    fonts-noto \
-	    ttf-freefont \
+	    fonts-freefont-ttf \
 	    libcups2 \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -29,9 +27,9 @@ RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \
     && mkdir -p /usr/share/man/man1 \
     && apt-get install --no-install-recommends -y \
         nodejs \
-        openjdk-8-jre-headless \
+        openjdk-11-jre-headless \
         ca-certificates-java \
-    && npm install selenium-standalone@latest -g \
+    && npm install selenium-standalone@latest yarn -g \
     && selenium-standalone install \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/lebeda/7.1/000-default.conf → lebeda/8.2/000-default.conf b/lebeda/7.1/000-default.conf → lebeda/8.2/000-default.conf
diff --git a/lebeda/7.3/Dockerfile → lebeda/8.2/Dockerfile b/lebeda/7.3/Dockerfile → lebeda/8.2/Dockerfile
@@ -1,6 +1,4 @@
-FROM php:7.3.13-apache
-
-LABEL maintainer="frantisekmasa1@gmail.com"
+FROM php:8.2.4-apache
 
 WORKDIR /var/www/html
 
@@ -21,7 +19,7 @@ RUN apt-get update \
 	    libxml2-dev \
 	    libzip-dev \
 	    locales \
-	&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
+	&& docker-php-ext-configure gd --with-freetype --with-jpeg \
 	&& docker-php-ext-install -j$(nproc) gd soap mysqli pdo pdo_mysql zip bcmath intl \
 	&& pecl install xdebug \
 	&& rm -rf /var/lib/apt/lists/*
@@ -42,6 +40,8 @@ ADD 000-default.conf /etc/apache2/sites-enabled/000-default.conf
 RUN ln -s /etc/apache2/mods-available/headers.load /etc/apache2/mods-enabled \
     && a2enmod rewrite
 
+ADD php.ini /usr/local/etc/php/conf.d/php.ini
+
 # Add startup script
 ADD run.sh /run.sh
 RUN chmod u+x /run.sh

diff --git a/lebeda/8.2/php.ini b/lebeda/8.2/php.ini
@@ -0,0 +1 @@
+upload_max_filesize=20M
diff --git a/lebeda/7.1/run.sh → lebeda/8.2/run.sh b/lebeda/7.1/run.sh → lebeda/8.2/run.sh
diff --git a/lebeda/8.3-ci/Dockerfile b/lebeda/8.3-ci/Dockerfile
@@ -0,0 +1,35 @@
+FROM skaut/lebeda:8.3
+
+# Install build tools
+RUN apt-get update && apt-get install -y \
+        gnupg2 \
+        apt-transport-https \
+        gettext-base \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Install Google Chrome
+RUN curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && echo "deb https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+    && apt-get update && apt-get install --no-install-recommends -y \
+	    google-chrome-stable \
+	    fontconfig \
+	    fonts-ipafont-gothic \
+	    fonts-wqy-zenhei \
+	    fonts-thai-tlwg \
+	    fonts-kacst \
+	    fonts-noto \
+	    fonts-freefont-ttf \
+	    libcups2 \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Install Selenium
+RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - \
+    && mkdir -p /usr/share/man/man1 \
+    && apt-get install --no-install-recommends -y \
+        nodejs \
+        openjdk-17-jre-headless \
+        ca-certificates-java \
+    && npm install selenium-standalone@latest yarn -g \
+    && selenium-standalone install \
+	&& rm -rf /var/lib/apt/lists/*
+
diff --git a/lebeda/7.3/000-default.conf → lebeda/8.3/000-default.conf b/lebeda/7.3/000-default.conf → lebeda/8.3/000-default.conf
diff --git a/lebeda/8.3/Dockerfile b/lebeda/8.3/Dockerfile
@@ -0,0 +1,50 @@
+FROM php:8.3.8-apache
+
+WORKDIR /var/www/html
+
+# Set www-data UID to first non-root UID
+# This should make file permissions inside container working out of the box
+# for most of developers.
+RUN usermod -u 1000 www-data
+
+# Install PHP extensions and other dependencies
+RUN apt-get update \
+	&& apt-get install -y \
+	    git \
+	    zlib1g-dev \
+	    libfreetype6-dev \
+	    libjpeg62-turbo-dev \
+	    libmcrypt-dev \
+	    libpng-dev \
+	    libxml2-dev \
+	    libzip-dev \
+	    locales \
+	&& docker-php-ext-configure gd --with-freetype --with-jpeg \
+	&& docker-php-ext-install -j$(nproc) gd soap mysqli pdo pdo_mysql zip bcmath intl \
+	&& pecl install xdebug \
+	&& rm -rf /var/lib/apt/lists/*
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Install Phing
+RUN curl -o /usr/local/bin/phing https://www.phing.info/get/phing-latest.phar && chmod +x /usr/local/bin/phing
+
+# Generate Czech locale
+RUN sed -i -e 's/# cs_CZ.UTF-8 UTF-8/cs_CZ.UTF-8 UTF-8/' /etc/locale.gen \
+    && dpkg-reconfigure --frontend=noninteractive locales \
+    && update-locale LANG=cs_CZ.UTF-8
+
+# Configure Apache
+ADD 000-default.conf /etc/apache2/sites-enabled/000-default.conf
+RUN ln -s /etc/apache2/mods-available/headers.load /etc/apache2/mods-enabled \
+    && a2enmod rewrite
+
+ADD php.ini /usr/local/etc/php/conf.d/php.ini
+
+# Add startup script
+ADD run.sh /run.sh
+RUN chmod u+x /run.sh
+
+CMD ["/run.sh"]
+
diff --git a/lebeda/8.3/php.ini b/lebeda/8.3/php.ini
@@ -0,0 +1 @@
+upload_max_filesize=20M
diff --git a/lebeda/7.3/run.sh → lebeda/8.3/run.sh b/lebeda/7.3/run.sh → lebeda/8.3/run.sh