Skip to content

Commit

Permalink
unused files removed
Browse files Browse the repository at this point in the history
  • Loading branch information
aserstobitov committed Feb 27, 2024
1 parent 6f1c5a5 commit 70f0cf9
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 202 deletions.
7 changes: 7 additions & 0 deletions .env.docker.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export APP_URL=http://localhost:8000
export IMAGE_NAME= # Your generated Shopware image
export APP_SECRET=some-secret
export INSTANCE_ID=some-string
export MYSQL_PASSWORD= # Generate yourself
export JWT_PUBLIC_KEY= # Generated in Github actions
export JWT_PRIVATE_KEY= # Generated in Github actions
29 changes: 0 additions & 29 deletions .github/workflows/lint.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/security.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/shell-lint.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea
composer.lock
vendor
vendor
.env.docker
23 changes: 0 additions & 23 deletions Dockerfile

This file was deleted.

23 changes: 0 additions & 23 deletions caddy/Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions caddy/rootfs/etc/caddy/Caddyfile

This file was deleted.

16 changes: 0 additions & 16 deletions caddy/rootfs/etc/supervisord.conf

This file was deleted.

60 changes: 24 additions & 36 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
x-app: &app
image: '${IMAGE_NAME}'
volumes:
- files:/var/www/html/files
- theme:/var/www/html/public/theme
- media:/var/www/html/public/media
- thumbnail:/var/www/html/public/thumbnail
- sitemap:/var/www/html/public/sitemap
environment:
APP_ENV: prod
APP_URL: '${APP_URL}'
JWT_PRIVATE_KEY: '${JWT_PRIVATE_KEY}'
JWT_PUBLIC_KEY: '${JWT_PUBLIC_KEY}'
DATABASE_HOST: db
DATABASE_URL: mysql://shopware:${MYSQL_PASSWORD}@db/shopware

version: "3.8"
services:
db:
image: mysql:8.0
environment:
MYSQL_ROOT_PASSWORD: 'shopware'
MYSQL_USER: shopware
MYSQL_PASSWORD: shopware
MYSQL_PASSWORD: '${MYSQL_PASSWORD}'
MYSQL_DATABASE: shopware
volumes:
- mysql-data:/var/lib/mysql
- mysql-data:/var/lib/mysql

init-perm:
image: alpine
Expand All @@ -21,57 +36,30 @@ services:
command: chown 82:82 /var/www/html/files /var/www/html/public/theme /var/www/html/public/media /var/www/html/public/thumbnail /var/www/html/public/sitemap

init:
image: ghcr.io/aserstobitov/docker-base:8.2-fpm-amd64
build:
context: .
env_file: .app.env
<<: *app
entrypoint: /setup
volumes:
- files:/var/www/html/files
- theme:/var/www/html/public/theme
- media:/var/www/html/public/media
- thumbnail:/var/www/html/public/thumbnail
- sitemap:/var/www/html/public/sitemap
depends_on:
db:
condition: service_started
init-perm:
condition: service_completed_successfully
web:
image: ghcr.io/aserstobitov/docker-base:8.2-fpm-amd64
build:
context: .
volumes:
- files:/var/www/html/files
- theme:/var/www/html/public/theme
- media:/var/www/html/public/media
- thumbnail:/var/www/html/public/thumbnail
- sitemap:/var/www/html/public/sitemap
<<: *app
depends_on:
init:
condition: service_completed_successfully
env_file: .app.env
ports:
- 8000:8000

worker:
image: ghcr.io/aserstobitov/docker-base:8.2-fpm-amd64
<<: *app
restart: unless-stopped
build:
context: .
volumes:
- files:/var/www/html/files
- theme:/var/www/html/public/theme
- media:/var/www/html/public/media
- thumbnail:/var/www/html/public/thumbnail
- sitemap:/var/www/html/public/sitemap
depends_on:
init:
condition: service_completed_successfully
env_file: .app.env
init:
condition: service_completed_successfully
entrypoint: [ "php", "bin/console", "messenger:consume", "async", "--time-limit=300", "--memory-limit=512M" ]
deploy:
replicas: 3
replicas: 3

volumes:
mysql-data:
Expand Down

0 comments on commit 70f0cf9

Please sign in to comment.