From 10a63b46bf41425f47f7d5810df2ce278d88bf1a Mon Sep 17 00:00:00 2001 From: soheil khaledabadi Date: Sat, 6 Jun 2026 21:20:17 +0330 Subject: [PATCH] refactor(docker): remove DOCKER_REGISTRY argument from Dockerfile and docker-compose.yml for simplification --- Dockerfile | 28 +++++----------------------- docker-compose.yml | 4 ---- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index eaaa1d5..3726990 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,4 @@ -# syntax=docker/dockerfile:1.7 - -ARG DOCKER_REGISTRY=docker.arvancloud.ir -ARG PHP_VERSION=8.4 - -# FROM ${DOCKER_REGISTRY}/node:24-alpine AS assets -# WORKDIR /app -# -# RUN sed -i 's|https://dl-cdn.alpinelinux.org|https://mirror.arvancloud.ir/alpine|g' /etc/apk/repositories -# -# COPY package.json package-lock.json ./ -# RUN npm ci -# -# COPY resources ./resources -# COPY public ./public -# COPY vite.config.js ./ -# RUN npm run build - -ARG DOCKER_REGISTRY -ARG PHP_VERSION -FROM ${DOCKER_REGISTRY}/php:${PHP_VERSION}-fpm-bookworm AS app +FROM docker.arvancloud.ir/php:8.4-fpm-bookworm AS app WORKDIR /var/www/html ENV COMPOSER_ALLOW_SUPERUSER=1 @@ -90,8 +70,7 @@ EXPOSE 9000 ENTRYPOINT ["docker-entrypoint"] CMD ["php-fpm"] -ARG DOCKER_REGISTRY -FROM ${DOCKER_REGISTRY}/nginx:1.27-alpine AS nginx +FROM docker.arvancloud.ir/nginx:1.27-alpine AS nginx RUN sed -i 's|https://dl-cdn.alpinelinux.org|https://mirror.arvancloud.ir/alpine|g' /etc/apk/repositories @@ -99,3 +78,6 @@ COPY docker/nginx/default.conf /etc/nginx/conf.d/default.conf COPY --from=app /var/www/html/public /var/www/html/public EXPOSE 80 + +# npm build (run locally before docker build): +# npm ci && npm run build diff --git a/docker-compose.yml b/docker-compose.yml index bd457be..59ff9bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,6 @@ services: build: context: . target: app - args: - DOCKER_REGISTRY: docker.arvancloud.ir image: hoshpoint-backend-app:production restart: unless-stopped env_file: @@ -27,8 +25,6 @@ services: build: context: . target: nginx - args: - DOCKER_REGISTRY: docker.arvancloud.ir image: hoshpoint-backend-nginx:production restart: unless-stopped depends_on: