From 50a719ef1241e51a98b5c023d6dca298ff3fe343 Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 6 Jan 2025 19:51:31 +0000 Subject: [PATCH] Use official images --- .devcontainer/Dockerfile | 19 +++++++++----- .devcontainer/devcontainer.json | 39 ++++++++------------------- .devcontainer/docker-compose.yml | 45 ++++++++++++++++++++------------ 3 files changed, 51 insertions(+), 52 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9ec621c0..bb19dbd4 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,11 +1,16 @@ -FROM php:8-apache +FROM mcr.microsoft.com/devcontainers/php:1-${templateOption:imageVariant} -RUN apt-get update && apt-get upgrade && apt-get install -y imagemagick git +# Install MariaDB client +RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mariadb-client \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/* -RUN a2enmod ssl && a2enmod rewrite +# Install php-mysql driver +RUN docker-php-ext-install mysqli pdo pdo_mysql -# Built-in tool for adding modules -RUN docker-php-ext-install pdo pdo_mysql +# [Optional] Uncomment this section to install additional OS packages. +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends -RUN chmod u+s,g+s /var/www/html/ -RUN chown -R www-data:www-data /var/www/html/ +# [Optional] Uncomment this line to install global node packages. +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8db14e46..9b7447e7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,40 +1,23 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose +// README at: https://github.com/devcontainers/templates/tree/main/src/php-mariadb { - "name": "Existing Docker Compose (Extend)", - - // Update the 'dockerComposeFile' list if you have more compose files or use different names. - // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make. - "dockerComposeFile": [ - "../.devcontainer/docker-compose.yml" - ], - - // The 'service' property is the name of the service for the container that VS Code should - // use. Update this value and .devcontainer/docker-compose.yml to the real service name. - "service": "web", - - // The optional 'workspaceFolder' property is the path VS Code should open by default when - // connected. This is typically a file mount in .devcontainer/docker-compose.yml - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}" + "name": "PHP & MariaDB", + "dockerComposeFile": "docker-compose.yml", + "service": "app", + "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], + // For use with PHP or Apache (e.g.php -S localhost:8080 or apache2ctl start) + "forwardPorts": [8080, 3306] - // Uncomment the next line if you want start specific services in your Docker Compose config. - // "runServices": [], - - // Uncomment the next line if you want to keep your containers running after VS Code shuts down. - // "shutdownAction": "none", - - // Uncomment the next line to run commands after the container is created. - // "postCreateCommand": "cat /etc/os-release", + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "sudo chmod a+x \"$(pwd)\" && sudo rm -rf /var/www/html && sudo ln -s \"$(pwd)\" /var/www/html" // Configure tool-specific properties. // "customizations": {}, - // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "devcontainer" + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" } \ No newline at end of file diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index c71b7c23..1c6f50eb 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,25 +1,36 @@ -services: - web: +version: '3.8' + +services: + app: build: context: . dockerfile: Dockerfile + volumes: - ../..:/workspaces:cached - ports: - - 8085:80 - depends_on: - - db + + # Overrides default command so things don't shut down after the process ends. + command: sleep infinity + + # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. + network_mode: service:db + + # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. + # (Adding the "ports" property to this file will not forward from a Codespace.) + db: - image: mariadb:latest - command: --sql-mode="" - environment: - MYSQL_ROOT_PASSWORD: secret - MYSQL_DATABASE: sfiab - MYSQL_USER: sfiab - MYSQL_PASSWORD: ScienceFair123! - ports: - - 3306:3306 + image: mariadb:10.4 + restart: unless-stopped volumes: - - db_data:/var/lib/mysql + - mariadb-data:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: mariadb + MYSQL_DATABASE: mariadb + MYSQL_USER: mariadb + MYSQL_PASSWORD: mariadb + + # Add "forwardPorts": ["3306"] to **devcontainer.json** to forward MariaDB locally. + # (Adding the "ports" property to this file will not forward from a Codespace.) + volumes: - db_data: + mariadb-data: \ No newline at end of file