Merge pull request #49 from andrey-mokhov/improve-examples

Improve docker images for examples
andrey-mokhov · Dec 26, 2023 · b0a0dfa · b0a0dfa
2 parents e0f3c8e + cc7aebf
commit b0a0dfa
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/examples/spiral/Dockerfile b/examples/spiral/Dockerfile
@@ -1,11 +1,6 @@
-ARG RR_VERSION
-ARG RR_IMAGE=spiralscout/roadrunner:${RR_VERSION}
-ARG PHP_IMAGE_VERSION
-ARG PHP_IMAGE=php:${PHP_IMAGE_VERSION}
+FROM spiralscout/roadrunner:2023.3.8 as rr
 
-FROM ${RR_IMAGE} as rr
-
-FROM ${PHP_IMAGE}
+FROM php:8.1-cli-alpine3.18
 
 # Copy Composer
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

diff --git a/examples/spiral/docker-compose.yml b/examples/spiral/docker-compose.yml
@@ -8,9 +8,6 @@ services:
     user: ${UID}
     build:
       dockerfile: Dockerfile
-      args:
-        PHP_IMAGE_VERSION: ${PHP_IMAGE_VERSION}
-        RR_VERSION: ${RR_VERSION}
     environment:
       PHP_IDE_CONFIG: serverName=graphql-example.local
       XDEBUG_MODE: debug

diff --git a/examples/spiral/makefile b/examples/spiral/makefile
@@ -2,15 +2,11 @@
 MAKEFLAGS += --no-print-directory
 
 .EXPORT_ALL_VARIABLES:
-PHP_IMAGE_VERSION := 8.1-cli-alpine3.18
-RR_VERSION := 2023.3.8
 ROOT_DIR := $(shell pwd)
 
 install:
 	@cp .env.sample .env
 	@echo "UID=$(shell id -u)" >> .env
-	@echo "PHP_IMAGE_VERSION=$PHP_IMAGE_VERSION" >> .env
-	@echo "RR_VERSION=$RR_VERSION" >> .env
 	@docker-compose build
 	@make composer_install
 	@docker run -ti --rm -v ${ROOT_DIR}:/data graphql-spiral:local sh -c "cd /data && php app.php encrypt:key --no-ansi -n -m .env"