From 5b51e6d0257e792c37800faf47c538ad63592348 Mon Sep 17 00:00:00 2001 From: Matei Stanca Date: Fri, 10 May 2024 18:17:33 -0400 Subject: [PATCH] Removed DDEV phpMyAdmin add-on; we recommend using a standalone client: For example, Antares SQL is a great FOSS app that's available for Linux, Mac, and Windows: https://antares-sql.app/ --- .ddev/addon-metadata/phpmyadmin/manifest.yaml | 10 ---- .ddev/commands/host/phpmyadmin | 52 ------------------- .ddev/docker-compose.phpmyadmin-norouter.yaml | 4 -- .ddev/docker-compose.phpmyadmin.yaml | 27 ---------- 4 files changed, 93 deletions(-) delete mode 100644 .ddev/addon-metadata/phpmyadmin/manifest.yaml delete mode 100644 .ddev/commands/host/phpmyadmin delete mode 100644 .ddev/docker-compose.phpmyadmin-norouter.yaml delete mode 100644 .ddev/docker-compose.phpmyadmin.yaml diff --git a/.ddev/addon-metadata/phpmyadmin/manifest.yaml b/.ddev/addon-metadata/phpmyadmin/manifest.yaml deleted file mode 100644 index 600d6a63..00000000 --- a/.ddev/addon-metadata/phpmyadmin/manifest.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: phpmyadmin -repository: ddev/ddev-phpmyadmin -version: v0.3.0 -install_date: "2023-07-29T11:06:07-04:00" -project_files: - - docker-compose.phpmyadmin.yaml - - docker-compose.phpmyadmin-norouter.yaml - - commands/host/phpmyadmin -global_files: [] -removal_actions: [] diff --git a/.ddev/commands/host/phpmyadmin b/.ddev/commands/host/phpmyadmin deleted file mode 100644 index e0c9bc60..00000000 --- a/.ddev/commands/host/phpmyadmin +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -## #ddev-generated: If you want to edit and own this file, remove this line. -## Description: Launch a browser with PhpMyAdmin -## Usage: phpmyadmin -## Example: "ddev phpmyadmin" - -DDEV_PHPMYADMIN_PORT=8036 -DDEV_PHPMYADMIN_HTTPS_PORT=8037 - -FULLURL=${DDEV_PRIMARY_URL} -HTTPS="" -if [ ${DDEV_PRIMARY_URL%://*} = "https" ]; then HTTPS=true; fi - -if [[ ! -z "${GITPOD_INSTANCE_ID}" ]] || [[ "${CODESPACES}" == "true" ]]; then - FULLURL="${FULLURL/-${DDEV_HOST_WEBSERVER_PORT}/-${DDEV_PHPMYADMIN_PORT}}" -else - if [ "${HTTPS}" = "" ]; then - FULLURL="${FULLURL%:[0-9]*}:${DDEV_PHPMYADMIN_PORT}" - else - FULLURL="${FULLURL%:[0-9]*}:${DDEV_PHPMYADMIN_HTTPS_PORT}" - fi -fi - -if [ -n "${1:-}" ] ; then - if [[ ${1::1} != "/" ]] ; then - FULLURL="${FULLURL}/"; - fi - - FULLURL="${FULLURL}${1}"; -fi - -if [ "${DDEV_DEBUG:-}" = "true" ]; then - printf "FULLURL $FULLURL\n" && exit 0 -fi - -case $OSTYPE in - linux-gnu) - if [[ ! -z "${GITPOD_INSTANCE_ID}" ]]; then - gp preview ${FULLURL} - else - xdg-open ${FULLURL} - fi - ;; - "darwin"*) - open ${FULLURL} - ;; - "win*"* | "msys"*) - start ${FULLURL} - ;; -esac - diff --git a/.ddev/docker-compose.phpmyadmin-norouter.yaml b/.ddev/docker-compose.phpmyadmin-norouter.yaml deleted file mode 100644 index f369b695..00000000 --- a/.ddev/docker-compose.phpmyadmin-norouter.yaml +++ /dev/null @@ -1,4 +0,0 @@ -#ddev-generated -# If omit_containers[ddev-router] then this file will be replaced -# with another with a `ports` statement to directly expose port 80 to 8036 -services: {} diff --git a/.ddev/docker-compose.phpmyadmin.yaml b/.ddev/docker-compose.phpmyadmin.yaml deleted file mode 100644 index 7e5b381d..00000000 --- a/.ddev/docker-compose.phpmyadmin.yaml +++ /dev/null @@ -1,27 +0,0 @@ -#ddev-generated -services: - phpmyadmin: - container_name: ddev-${DDEV_SITENAME}-phpmyadmin - image: phpmyadmin:5 - working_dir: "/root" - restart: "no" - labels: - com.ddev.site-name: ${DDEV_SITENAME} - com.ddev.approot: $DDEV_APPROOT - expose: - - "80" - environment: - - PMA_USER=root - - PMA_PASSWORD=root - - PMA_HOST=db - - PMA_PORT=3306 - - VIRTUAL_HOST=$DDEV_HOSTNAME - - UPLOAD_LIMIT=4000M - - HTTP_EXPOSE=8036:80 - - HTTPS_EXPOSE=8037:80 - healthcheck: - interval: 120s - timeout: 2s - retries: 1 - depends_on: - - db