Merge pull request #4 from studio1gmbh/3.x-custom

Implement S1 changes into latest 3.x
studio1gmbh · Jul 30, 2024 · da821da · da821da
2 parents d617edd + 36d34ef
commit da821da
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,31 +9,31 @@ on:
  - cron: '30 2 * * 1,3,5'
 
 env:
- IMAGE_NAME: pimcore/pimcore
+ IMAGE_NAME: s1kom/pimcore-custom
 
 jobs:
  build-php:
  name: "Build PHP images"
  runs-on: ubuntu-latest
- if: github.repository == 'pimcore/docker'
+ if: github.repository == 'studio1gmbh/pimcore-docker'
  strategy:
  matrix:
  include:
- - { tag: '1.x', php: '8.0', distro: bullseye, version-override: "v1-dev", latest-tag: false }
- - { tag: '1.x', php: '8.1', distro: bullseye, version-override: "v1-dev", latest-tag: false }
- - { tag: '1.x', php: '8.2', distro: bullseye, version-override: "v1-dev", latest-tag: false }
- - { tag: 'v1.3', php: '8.0', distro: bullseye, version-override: "", latest-tag: true }
- - { tag: 'v1.3', php: '8.1', distro: bullseye, version-override: "", latest-tag: true }
- - { tag: 'v1.3', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
- - { tag: 'v2.0', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
- - { tag: '2.x', php: '8.2', distro: bullseye, version-override: "v2-dev", latest-tag: false }
- - { tag: 'v3.0', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
- - { tag: 'v3.1', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
- - { tag: 'v3.2', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
- - { tag: 'v3.3', php: '8.2', distro: bookworm, version-override: "", latest-tag: true }
- - { tag: 'v3.3', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true }
- - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false }
- - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false }
+ #- { tag: '1.x', php: '8.0', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+ #- { tag: '1.x', php: '8.1', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+ #- { tag: '1.x', php: '8.2', distro: bullseye, version-override: "v1-dev", latest-tag: false }
+ #- { tag: 'v1.3', php: '8.0', distro: bullseye, version-override: "", latest-tag: true }
+ #- { tag: 'v1.3', php: '8.1', distro: bullseye, version-override: "", latest-tag: true }
+ #- { tag: 'v1.3', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
+ #- { tag: 'v2.0', php: '8.2', distro: bullseye, version-override: "", latest-tag: false }
+ #- { tag: '2.x', php: '8.2', distro: bullseye, version-override: "v2-dev", latest-tag: false }
+ #- { tag: 'v3.0', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
+ #- { tag: 'v3.1', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
+ #- { tag: 'v3.2', php: '8.2', distro: bookworm, version-override: "", latest-tag: false }
+ #- { tag: 'v3.3', php: '8.2', distro: bookworm, version-override: "", latest-tag: true }
+ - { tag: 'v3.3-0', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true }
+ #- { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false }
+ #- { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false }
 
  steps:
  - uses: actions/checkout@v3

diff --git a/Dockerfile b/Dockerfile
@@ -28,6 +28,9 @@ RUN set -eux; \
  libzip-dev \
  zlib1g-dev \
  librabbitmq-dev \
+ # studio1 start
+ nodejs npm cifs-utils iputils-ping htop nano m4 \
+ # studio1 end
  ; \
  \
  docker-php-ext-configure gd --enable-gd --with-jpeg; \
@@ -59,10 +62,13 @@ RUN set -eux; \
 COPY files/conf/php/php.ini /usr/local/etc/php/conf.d/20-pimcore.ini
 COPY files/conf/php-fpm/php-fpm.conf /usr/local/etc/php-fpm.d/zz-www.conf
 
+RUN echo "user = root" >> /usr/local/etc/php-fpm.d/zz-docker.conf; \
+ echo "group = root" >> /usr/local/etc/php-fpm.d/zz-docker.conf;
+
 # env php.ini
-ENV PHP_MEMORY_LIMIT "256M"
-ENV PHP_POST_MAX_SIZE "100M"
-ENV PHP_UPLOAD_MAX_FILESIZE "100M"
+ENV PHP_MEMORY_LIMIT "1024M"
+ENV PHP_POST_MAX_SIZE "1024M"
+ENV PHP_UPLOAD_MAX_FILESIZE "1024M"
 ENV PHP_DISPLAY_STARTUP_ERRORS 1
 ENV PHP_MAX_EXECUTION_TIME "30"
 ENV PHP_ERROR_REPORTING "E_ALL"
@@ -90,7 +96,7 @@ COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer
 
 WORKDIR /var/www/html
 
-CMD ["php-fpm"]
+CMD ["php-fpm", "--allow-to-run-as-root"]
 
 
 
@@ -168,7 +174,7 @@ RUN set -eux; \
  \
  sync
 
-CMD ["php-fpm"]
+CMD ["php-fpm", "--allow-to-run-as-root"]
 
 
 
@@ -202,7 +208,7 @@ RUN set -eux; \
  \
  sync
 
-CMD ["php-fpm"]
+CMD ["php-fpm", "--allow-to-run-as-root"]
 
 
 
@@ -227,7 +233,7 @@ ENV PHP_IDE_CONFIG serverName=localhost
 COPY --chmod=0755 files/entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["php-fpm"]
+CMD ["php-fpm", "--allow-to-run-as-root"]