Skip to content

Commit

Permalink
v1.1.3 (#9)
Browse files Browse the repository at this point in the history
v1.1.3
  • Loading branch information
Kasui92 authored Sep 6, 2023
1 parent c6ba5a5 commit 54e676d
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .docker/services/php/Dockerfile.php56
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create image based on the official PHP-FMP image
FROM php:5.6-fpm
# Create image based on the official PHP-FMP image
FROM php:5.6-fpm-stretch

# Arguments defined in docker-compose.yml
ARG uid
Expand Down
2 changes: 1 addition & 1 deletion .docker/services/php/Dockerfile.php73
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create image based on the official PHP-FMP image
FROM php:7.3-fpm
FROM php:7.3-fpm-buster

# Arguments defined in docker-compose.yml
ARG uid
Expand Down
2 changes: 1 addition & 1 deletion .docker/services/php/Dockerfile.php8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create image based on the official PHP-FMP image
FROM php:8.0-fpm
FROM php:8.0-fpm-bullseye

# Arguments defined in docker-compose.yml
ARG uid
Expand Down
18 changes: 17 additions & 1 deletion gdrcd-stack
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi

# Custom docker-compose command
_dc() {
docker-compose -p "$PROJECT" -f "$_PATH_DOCKER/docker-compose.yml" -f "$_PATH_DOCKER/docker-compose.$ENV.yml" --env-file "$_PATH_DIR/.env" ${TTY} "$@"
docker compose -p "$PROJECT" -f "$_PATH_DOCKER/docker-compose.yml" -f "$_PATH_DOCKER/docker-compose.$ENV.yml" --env-file "$_PATH_DIR/.env" ${TTY} "$@"
}

# Check non-existent arguments
Expand All @@ -57,6 +57,21 @@ _checkDocker() {
fi;
}

# Check if docker compose is installed
_checkDockerCompose() {
if ! type "docker-compose" >/dev/null 2>&1; then
echo "Error: this stack requires Docker Compose v2, please install it and try again"
exit 1;
fi;


# check if docker compose is installed
if ! type "docker compose" >/dev/null 2>&1; then
echo "Error: Docker Compose not found"
exit 1;
fi;
}

# Check if environment is set
_checkEnvironment() {
if [[ -z ${ENV+x} ]]; then
Expand Down Expand Up @@ -110,6 +125,7 @@ restart() {
# !IMPORTANT
# Execute the action passed as the first argument
_checkDocker; \
_checkDockerCompose; \
_checkEnvironment; \
_isCommand "${1:-help}"; \
# This idea is heavily inspired by: https://github.com/adriancooney/Taskfile
Expand Down

0 comments on commit 54e676d

Please sign in to comment.