fix: update fly image from focal to jammy

Author: mychidarko

composer.json

@@ -2,7 +2,7 @@
     "name": "leafs/cli",
     "description": "A simple command line tool for installing and interacting with your leaf apps",
     "homepage": "https://cli.leafphp.dev",
-    "version": "v4.5.1",
+    "version": "v4.5.2",
     "keywords": [
         "leaf",
         "php",

src/themes/fly/Dockerfile

@@ -1,17 +1,12 @@
 #!/usr/bin/env bash
 
-# syntax = docker/dockerfile:experimental
+# syntax=docker/dockerfile:experimental
 
-# Default to PHP 8.2, but we attempt to match
-# the PHP version from the user (wherever `flyctl launch` is run)
-# Valid version values are PHP 7.4+
 ARG PHP_VERSION=8.2
 ARG NODE_VERSION=18
-FROM --platform=linux/amd64 mychidarko/leaf-fly-fpm:${PHP_VERSION} as base
+FROM ubuntu:22.04 as base
 LABEL fly_launch_runtime="leaf"
 
-# PHP_VERSION needs to be repeated here
-# See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
 ARG PHP_VERSION
 ENV DEBIAN_FRONTEND=noninteractive \
     COMPOSER_ALLOW_SUPERUSER=1 \
@@ -27,30 +22,20 @@ ENV DEBIAN_FRONTEND=noninteractive \
     PHP_MEMORY_LIMIT=256M \
     PHP_MAX_EXECUTION_TIME=90 \
     PHP_POST_MAX_SIZE=100M \
-    PHP_UPLOAD_MAX_FILE_SIZE=100M \
+    PHP_UPLOAD_MAX_FILE_SIZE=500M \
     PHP_ALLOW_URL_FOPEN=Off
 
-# Prepare base container:
-# 1. Install PHP, Composer
+# Install system packages
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 COPY .fly/php/ondrej_ubuntu_php.gpg /etc/apt/trusted.gpg.d/ondrej_ubuntu_php.gpg
 ADD .fly/php/packages/${PHP_VERSION}.txt /tmp/php-packages.txt
 
-RUN apt-get update
-RUN apt-get install -y --no-install-recommends gnupg2 ca-certificates git-core curl zip unzip \
-    rsync vim-tiny htop sqlite3 nginx supervisor cron mysql-server postgresql postgresql-client \
-    libpq-dev libzip-dev libpng-dev libjpeg-dev libfreetype6-dev libxml2-dev
-
-RUN ln -sf /usr/bin/vim.tiny /etc/alternatives/vim \
-    && ln -sf /etc/alternatives/vim /usr/bin/vim
-
-RUN apt-get update && apt-get install -y wget gnupg && \
-    echo "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-
-RUN apt-get update && apt-get install -y libpq-dev postgresql-client
-
-RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu focal main" > /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends gnupg2 ca-certificates git-core curl zip unzip \
+                                                  rsync vim-tiny htop sqlite3 nginx supervisor cron \
+    && ln -sf /usr/bin/vim.tiny /etc/alternatives/vim \
+    && ln -sf /etc/alternatives/vim /usr/bin/vim \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-ubuntu-php-focal.list \
     && apt-get update \
     && apt-get -y --no-install-recommends install $(cat /tmp/php-packages.txt) \
     && ln -sf /usr/sbin/php-fpm${PHP_VERSION} /usr/sbin/php-fpm \
@@ -66,77 +51,41 @@ COPY .fly/entrypoint.sh /entrypoint
 COPY .fly/start-nginx.sh /usr/local/bin/start-nginx
 RUN chmod 754 /usr/local/bin/start-nginx
 
-# copy application code, skipping files based on .dockerignore
+# 3. Copy application code, skipping files based on .dockerignore
 COPY . /var/www/html
 WORKDIR /var/www/html
 
-RUN composer install --optimize-autoloader --no-dev \
-    # && mkdir -p storage/logs \
-    && chown -R www-data:www-data /var/www/html \
-    # && sed -i 's/protected \$proxies/protected \$proxies = "*"/g' app/Http/Middleware/TrustProxies.php \
-    # && echo "MAILTO=\"\"\n* * * * * www-data /usr/bin/php /var/www/html/artisan schedule:run" > /etc/cron.d/laravel \
-    && cp .fly/entrypoint.sh /entrypoint \
-    && chmod +x /entrypoint \
-    && touch .env
-    # \
-    # && supervisorctl reread \
-    # && supervisorctl update \
-    # && supervisorctl start redis
+RUN composer install --optimize-autoloader --no-dev && \
+    chown -R www-data:www-data /var/www/html && \
+    chmod +x /entrypoint && touch .env; \
+    if [ -d .fly ]; then cp .fly/entrypoint.sh /entrypoint; chmod +x /entrypoint; fi;
 
-# Multi-stage build: Build static assets
-# This allows us to not include Node within the final container
+# Node asset builder
 FROM node:${NODE_VERSION} as node_modules_go_brrr
 
-RUN mkdir /app
-
-RUN mkdir -p  /app
+RUN mkdir -p /app
 WORKDIR /app
 COPY . .
 COPY --from=base /var/www/html/vendor /app/vendor
 
-# Use yarn or npm depending on what type of
-# lock file we might find. Defaults to
-# NPM if no lock file is found.
 RUN if [ -f "yarn.lock" ]; then \
-    yarn install --frozen-lockfile; \
-    yarn build; \
+      yarn install --frozen-lockfile && yarn build; \
     elif [ -f "pnpm-lock.yaml" ]; then \
-    corepack enable && corepack prepare pnpm@latest-7 --activate; \
-    pnpm install --frozen-lockfile; \
-    pnpm run build; \
+      corepack enable && corepack prepare pnpm@latest-7 --activate && \
+      pnpm install --frozen-lockfile && pnpm run build; \
     elif [ -f "package-lock.json" ]; then \
-    npm ci --no-audit; \
-    npm run build; \
-    else \
-    # if no lock file is found, we check if we have a package.json
-    # and if so, we run npm install
-    if [ -f "package.json" ]; then \
-    npm install --force; \
-    npm run build; \
-    fi; \
-    fi;
+      npm ci --no-audit && npm run build; \
+    elif [ -f "package.json" ]; then \
+      npm install --force && npm run build; \
+    fi
 
-# From our base container created above, we
-# create our final image, adding in static
-# assets that we generated above
+# Final image
 FROM base
-
-# Packages like Laravel Nova may have added assets to the public directory
-# or maybe some custom assets were added manually! Either way, we merge
-# in the assets we generated above rather than overwrite them
 COPY --from=node_modules_go_brrr /app/public /var/www/html/public-npm
-RUN rsync -ar /var/www/html/public-npm/ /var/www/html/public/ \
-    && rm -rf /var/www/html/public-npm \
-    && chown -R www-data:www-data /var/www/html/public \
-    # && php leaf db:migrate \
-    && php leaf link \
-    && rm -rf public/hot
-
-# RUN rm -rf /etc/nginx/sites-enabled/default
-# RUN unlink /etc/nginx/sites-enabled/default
-
-# COPY --from=base /var/www/html/default /etc/nginx/sites-enabled/default
-# RUN ln -s /var/www/html/default /etc/nginx/sites-enabled/
+RUN rsync -ar /var/www/html/public-npm/ /var/www/html/public/ && \
+    rm -rf /var/www/html/public-npm && \
+    chown -R www-data:www-data /var/www/html/public && \
+    php leaf link && rm -rf public/hot
 
 EXPOSE 8080