fideloper/Dockerfile Secret

## default-octane.conf
# This is new thing 1
upstream backend {
    server 127.0.0.1:8000;
    server 127.0.0.1:8000;
}
# end new thing 1


server {
    listen 8080 default_server;
    listen [::]:8080 default_server;

    root /var/www/html/public;

    index index.html index.htm index.php;

    server_name _;

    charset utf-8;

    client_max_body_size 2048M;

    access_log /dev/stdout fly;

    location /index.php {
        try_files /not_exists @octane;
    }

    location / {
        try_files $uri $uri/ @octane;
    }

    location @octane {
        set $suffix "";

        if ($uri = /index.php) {
            set $suffix ?$query_string;
        }

        proxy_http_version 1.1;
        proxy_set_header Host $http_host;
        proxy_set_header Scheme $scheme;
        proxy_set_header SERVER_PORT $server_port;
        proxy_set_header REMOTE_ADDR $remote_addr;
        proxy_set_header X-Forwarded-For $http_fly_client_ip;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection $connection_upgrade;

        proxy_buffers 16 16k;
        proxy_buffer_size  32k;

        # This is new thing 2
        proxy_next_upstream_tries 3;

        proxy_pass http://backend$suffix;
        # End new thing 2
    }

    location = /favicon.ico {
        log_not_found off;
        access_log    off;
    }

    location = /robots.txt {
        log_not_found off;
        access_log    off;
    }

    location ~* \.(?:css(\.map)?|js(\.map)?|jpe?g|png|gif|ico|cur|heic|webp|tiff?|mp3|m4a|aac|ogg|midi?|wav|mp4|mov|webm|mpe?g|avi|ogv|flv|wmv)$ {
        expires    7d;
        access_log off;
        log_not_found off;
        # Pass to PHP to ensure PHP apps can handle routes that end in these filetypes
        try_files $uri @octane;
    }

    location ~* \.(?:svgz?|ttf|ttc|otf|eot|woff2?)$ {
        add_header Access-Control-Allow-Origin "*";
        expires    7d;
        access_log off;
    }

    location ~ /\.(?!well-known) {
        deny all;
    }

    add_header X-Frame-Options           "SAMEORIGIN" always;
    add_header X-Content-Type-Options    "nosniff" always;
    add_header Referrer-Policy           "no-referrer-when-downgrade" always;
}

## diff-notes.md

      
    Raw
  

              diff-notes.md
            
          
    The Dockerfile

# This is new thing 1a# 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 fideloper/fly-laravel:${PHP_VERSION} as base

# PHP_VERSION needs to be repeated here
# See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG PHP_VERSION

LABEL fly_launch_runtime="laravel"

# copy application code, skipping files based on .dockerignore
COPY . /var/www/html

RUN composer install --optimize-autoloader --no-dev \
    && mkdir -p storage/logs \
    && php artisan optimize:clear \
    && 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

+ COPY .fly/default-octane /etc/nginx/sites-available/default-octane

# If we're using Octane...
RUN if grep -Fq "laravel/octane" /var/www/html/composer.json; then \
        rm -rf /etc/supervisor/conf.d/fpm.conf; \
        if grep -Fq "spiral/roadrunner" /var/www/html/composer.json; then \
            mv /etc/supervisor/octane-rr.conf /etc/supervisor/conf.d/octane-rr.conf; \
            if [ -f ./vendor/bin/rr ]; then ./vendor/bin/rr get-binary; fi; \
            rm -f .rr.yaml; \
        else \
            mv .fly/octane-swoole /etc/services.d/octane; \
            mv /etc/supervisor/octane-swoole.conf /etc/supervisor/conf.d/octane-swoole.conf; \
        fi; \
        rm /etc/nginx/sites-enabled/default; \
        ln -sf /etc/nginx/sites-available/default-octane /etc/nginx/sites-enabled/default; \
    fi

# Multi-stage build: Build static assets
# This allows us to not include Node within the final container
FROM node:${NODE_VERSION} as node_modules_go_brrr

RUN mkdir /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.
# Note: We run "production" for Mix and "build" for Vite
RUN if [ -f "vite.config.js" ]; then \
        ASSET_CMD="build"; \
    else \
        ASSET_CMD="production"; \
    fi; \
    if [ -f "yarn.lock" ]; then \
        yarn install --frozen-lockfile; \
        yarn $ASSET_CMD; \
    elif [ -f "pnpm-lock.yaml" ]; then \
        corepack enable && corepack prepare pnpm@latest-8 --activate; \
        pnpm install --frozen-lockfile; \
        pnpm run $ASSET_CMD; \
    elif [ -f "package-lock.json" ]; then \
        npm ci --no-audit; \
        npm run $ASSET_CMD; \
    else \
        npm install; \
        npm run $ASSET_CMD; \
    fi;

# From our base container created above, we
# create our final image, adding in static
# assets that we generated above
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

EXPOSE 8080

ENTRYPOINT ["/entrypoint"]
The Nginx Config .fly/default-octane

+ # This is new thing 1
+ upstream backend {
+     server 127.0.0.1:8000;
+     server 127.0.0.1:8000;
+ }
+ # end new thing 1


server {
    listen 8080 default_server;
    listen [::]:8080 default_server;

    root /var/www/html/public;

    index index.html index.htm index.php;

    server_name _;

    charset utf-8;

    client_max_body_size 2048M;

    access_log /dev/stdout fly;

    location /index.php {
        try_files /not_exists @octane;
    }

    location / {
        try_files $uri $uri/ @octane;
    }

    location @octane {
        set $suffix "";

        if ($uri = /index.php) {
            set $suffix ?$query_string;
        }

        proxy_http_version 1.1;
        proxy_set_header Host $http_host;
        proxy_set_header Scheme $scheme;
        proxy_set_header SERVER_PORT $server_port;
        proxy_set_header REMOTE_ADDR $remote_addr;
        proxy_set_header X-Forwarded-For $http_fly_client_ip;
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Connection $connection_upgrade;

        proxy_buffers 16 16k;
        proxy_buffer_size  32k;

-       proxy_pass http://127.0.0.1:8000$suffix;
+       proxy_next_upstream_tries 3;
+ 
+       proxy_pass http://backend$suffix;
    }

    location = /favicon.ico {
        log_not_found off;
        access_log    off;
    }

    location = /robots.txt {
        log_not_found off;
        access_log    off;
    }

    location ~* \.(?:css(\.map)?|js(\.map)?|jpe?g|png|gif|ico|cur|heic|webp|tiff?|mp3|m4a|aac|ogg|midi?|wav|mp4|mov|webm|mpe?g|avi|ogv|flv|wmv)$ {
        expires    7d;
        access_log off;
        log_not_found off;
        # Pass to PHP to ensure PHP apps can handle routes that end in these filetypes
        try_files $uri @octane;
    }

    location ~* \.(?:svgz?|ttf|ttc|otf|eot|woff2?)$ {
        add_header Access-Control-Allow-Origin "*";
        expires    7d;
        access_log off;
    }

    location ~ /\.(?!well-known) {
        deny all;
    }

    add_header X-Frame-Options           "SAMEORIGIN" always;
    add_header X-Content-Type-Options    "nosniff" always;
    add_header Referrer-Policy           "no-referrer-when-downgrade" always;
}


## Dockerfile
# This is new thing 1a# 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 fideloper/fly-laravel:${PHP_VERSION} as base

# PHP_VERSION needs to be repeated here
# See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
ARG PHP_VERSION

LABEL fly_launch_runtime="laravel"

# copy application code, skipping files based on .dockerignore
COPY . /var/www/html

RUN composer install --optimize-autoloader --no-dev \
    && mkdir -p storage/logs \
    && php artisan optimize:clear \
    && 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

################################################################################
# NEW THING HERE:
# Over-ride octane Nginx to test
# Note the file name, add this file to `.fly/default-octane` in your code base
COPY .fly/default-octane /etc/nginx/sites-available/default-octane
# END NEW THING
################################################################################

# If we're using Octane...
RUN if grep -Fq "laravel/octane" /var/www/html/composer.json; then \
        rm -rf /etc/supervisor/conf.d/fpm.conf; \
        if grep -Fq "spiral/roadrunner" /var/www/html/composer.json; then \
            mv /etc/supervisor/octane-rr.conf /etc/supervisor/conf.d/octane-rr.conf; \
            if [ -f ./vendor/bin/rr ]; then ./vendor/bin/rr get-binary; fi; \
            rm -f .rr.yaml; \
        else \
            mv .fly/octane-swoole /etc/services.d/octane; \
            mv /etc/supervisor/octane-swoole.conf /etc/supervisor/conf.d/octane-swoole.conf; \
        fi; \
        rm /etc/nginx/sites-enabled/default; \
        ln -sf /etc/nginx/sites-available/default-octane /etc/nginx/sites-enabled/default; \
    fi

# Multi-stage build: Build static assets
# This allows us to not include Node within the final container
FROM node:${NODE_VERSION} as node_modules_go_brrr

RUN mkdir /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.
# Note: We run "production" for Mix and "build" for Vite
RUN if [ -f "vite.config.js" ]; then \
        ASSET_CMD="build"; \
    else \
        ASSET_CMD="production"; \
    fi; \
    if [ -f "yarn.lock" ]; then \
        yarn install --frozen-lockfile; \
        yarn $ASSET_CMD; \
    elif [ -f "pnpm-lock.yaml" ]; then \
        corepack enable && corepack prepare pnpm@latest-8 --activate; \
        pnpm install --frozen-lockfile; \
        pnpm run $ASSET_CMD; \
    elif [ -f "package-lock.json" ]; then \
        npm ci --no-audit; \
        npm run $ASSET_CMD; \
    else \
        npm install; \
        npm run $ASSET_CMD; \
    fi;

# From our base container created above, we
# create our final image, adding in static
# assets that we generated above
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

EXPOSE 8080

ENTRYPOINT ["/entrypoint"]
	# This is new thing 1
	upstream backend {
	server 127.0.0.1:8000;
	server 127.0.0.1:8000;
	}
	# end new thing 1


	server {
	listen 8080 default_server;
	listen [::]:8080 default_server;

	root /var/www/html/public;

	index index.html index.htm index.php;

	server_name _;

	charset utf-8;

	client_max_body_size 2048M;

	access_log /dev/stdout fly;

	location /index.php {
	try_files /not_exists @octane;
	}

	location / {
	try_files $uri $uri/ @octane;
	}

	location @octane {
	set $suffix "";

	if ($uri = /index.php) {
	set $suffix ?$query_string;
	}

	proxy_http_version 1.1;
	proxy_set_header Host $http_host;
	proxy_set_header Scheme $scheme;
	proxy_set_header SERVER_PORT $server_port;
	proxy_set_header REMOTE_ADDR $remote_addr;
	proxy_set_header X-Forwarded-For $http_fly_client_ip;
	proxy_set_header Upgrade $http_upgrade;
	proxy_set_header Connection $connection_upgrade;

	proxy_buffers 16 16k;
	proxy_buffer_size 32k;

	# This is new thing 2
	proxy_next_upstream_tries 3;

	proxy_pass http://backend$suffix;
	# End new thing 2
	}

	location = /favicon.ico {
	log_not_found off;
	access_log off;
	}

	location = /robots.txt {
	log_not_found off;
	access_log off;
	}

	location ~* \.(?:css(\.map)?\|js(\.map)?\|jpe?g\|png\|gif\|ico\|cur\|heic\|webp\|tiff?\|mp3\|m4a\|aac\|ogg\|midi?\|wav\|mp4\|mov\|webm\|mpe?g\|avi\|ogv\|flv\|wmv)$ {
	expires 7d;
	access_log off;
	log_not_found off;
	# Pass to PHP to ensure PHP apps can handle routes that end in these filetypes
	try_files $uri @octane;
	}

	location ~* \.(?:svgz?\|ttf\|ttc\|otf\|eot\|woff2?)$ {
	add_header Access-Control-Allow-Origin "*";
	expires 7d;
	access_log off;
	}

	location ~ /\.(?!well-known) {
	deny all;
	}

	add_header X-Frame-Options "SAMEORIGIN" always;
	add_header X-Content-Type-Options "nosniff" always;
	add_header Referrer-Policy "no-referrer-when-downgrade" always;
	}
	# This is new thing 1a# 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 fideloper/fly-laravel:${PHP_VERSION} as base

	# PHP_VERSION needs to be repeated here
	# See https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
	ARG PHP_VERSION

	LABEL fly_launch_runtime="laravel"

	# copy application code, skipping files based on .dockerignore
	COPY . /var/www/html

	RUN composer install --optimize-autoloader --no-dev \
	&& mkdir -p storage/logs \
	&& php artisan optimize:clear \
	&& 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

	################################################################################
	# NEW THING HERE:
	# Over-ride octane Nginx to test
	# Note the file name, add this file to `.fly/default-octane` in your code base
	COPY .fly/default-octane /etc/nginx/sites-available/default-octane
	# END NEW THING
	################################################################################

	# If we're using Octane...
	RUN if grep -Fq "laravel/octane" /var/www/html/composer.json; then \
	rm -rf /etc/supervisor/conf.d/fpm.conf; \
	if grep -Fq "spiral/roadrunner" /var/www/html/composer.json; then \
	mv /etc/supervisor/octane-rr.conf /etc/supervisor/conf.d/octane-rr.conf; \
	if [ -f ./vendor/bin/rr ]; then ./vendor/bin/rr get-binary; fi; \
	rm -f .rr.yaml; \
	else \
	mv .fly/octane-swoole /etc/services.d/octane; \
	mv /etc/supervisor/octane-swoole.conf /etc/supervisor/conf.d/octane-swoole.conf; \
	fi; \
	rm /etc/nginx/sites-enabled/default; \
	ln -sf /etc/nginx/sites-available/default-octane /etc/nginx/sites-enabled/default; \
	fi

	# Multi-stage build: Build static assets
	# This allows us to not include Node within the final container
	FROM node:${NODE_VERSION} as node_modules_go_brrr

	RUN mkdir /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.
	# Note: We run "production" for Mix and "build" for Vite
	RUN if [ -f "vite.config.js" ]; then \
	ASSET_CMD="build"; \
	else \
	ASSET_CMD="production"; \
	fi; \
	if [ -f "yarn.lock" ]; then \
	yarn install --frozen-lockfile; \
	yarn $ASSET_CMD; \
	elif [ -f "pnpm-lock.yaml" ]; then \
	corepack enable && corepack prepare pnpm@latest-8 --activate; \
	pnpm install --frozen-lockfile; \
	pnpm run $ASSET_CMD; \
	elif [ -f "package-lock.json" ]; then \
	npm ci --no-audit; \
	npm run $ASSET_CMD; \
	else \
	npm install; \
	npm run $ASSET_CMD; \
	fi;

	# From our base container created above, we
	# create our final image, adding in static
	# assets that we generated above
	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

	EXPOSE 8080

	ENTRYPOINT ["/entrypoint"]