Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ name: Docker
# documentation.

on:
schedule:
- cron: '30 0 * * *'
push:
branches: [ master ]
# Publish semver tags as releases.
Expand Down
3 changes: 3 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tasks:
- init: docker-compose build
command: docker-compose up -d
50 changes: 17 additions & 33 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,28 @@ services:
build:
context: docker/php-7.4
dockerfile: Dockerfile
# args:
# WWWGROUP: '${WWWGROUP}'
args:
WWWUSER: 1000
WWWGROUP: 1000
image: realworldio/laravel-sail:7.4
# ports:
# - '${APP_PORT:-80}:80'
# env_file: ./.env_file
# environment:
# WWWUSER: '${WWWUSER}'
# LARAVEL_SAIL: 1
# XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
# XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
# volumes:
# - '.:/var/www/html'
environment:
WWWUSER: 1000
LARAVEL_SAIL: 1
networks:
- sail
laravel8:
build:
context: docker/php-8.0
dockerfile: Dockerfile
args:
WWWUSER: 1000
WWWGROUP: 1000
image: realworldio/laravel-sail:8.0
environment:
WWWUSER: 1000
LARAVEL_SAIL: 1
networks:
- sail
# laravel8:
# build:
# context: docker/php-8.0
# dockerfile: Dockerfile
# # args:
# # WWWGROUP: '${WWWGROUP}'
# args:
# WWWGROUP: 1000
# image: realworldio/laravel-sail
# # ports:
# # - '${APP_PORT:-80}:80'
# # env_file: ./.env_file
# # environment:
# # WWWUSER: '${WWWUSER}'
# # LARAVEL_SAIL: 1
# # XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
# # XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
# # volumes:
# # - '.:/var/www/html'
# networks:
# - sail
networks:
sail:
driver: bridge
Expand Down
6 changes: 6 additions & 0 deletions docker/php-7.4/start-container
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ if [ ! -d /.composer ]; then
fi

chmod -R ugo+rw /.composer
# chown -R sail:sail /var/www/html

if test -f "/usr/local/bin/upstart-container"; then
chmod +x /usr/local/bin/upstart-container
bash /usr/local/bin/upstart-container
fi

if [ $# -gt 0 ];then
exec gosu $WWWUSER "$@"
Expand Down
8 changes: 7 additions & 1 deletion docker/php-8.0/start-container
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ if [ ! -d /.composer ]; then
fi

chmod -R ugo+rw /.composer
chown -R sail:sail /var/www/html
# chown -R sail:sail /var/www/html


if test -f "/usr/local/bin/upstart-container"; then
chmod +x /usr/local/bin/upstart-container
bash /usr/local/bin/upstart-container
fi

if [ $# -gt 0 ];then
exec gosu $WWWUSER "$@"
Expand Down