diff options
| author | Robin Windey <ro.windey@gmail.com> | 2023-03-18 16:48:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-31 13:53:04 +0000 |
| commit | 79fb336d35953a1bad648e256c5f57eee2809041 (patch) | |
| tree | 1fca3851f520e6e52ba31761c1681cb1b9451c75 /.devcontainer | |
| parent | 16c14c059d03069f7e19e100b60c550e8ac54a38 (diff) | |
| download | nextcloud-server-79fb336d35953a1bad648e256c5f57eee2809041.tar.gz nextcloud-server-79fb336d35953a1bad648e256c5f57eee2809041.zip | |
Use ubuntu jammy and cleanup Dockerfile
Signed-off-by: GitHub <noreply@github.com>
Diffstat (limited to '.devcontainer')
| -rw-r--r-- | .devcontainer/Dockerfile | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4d579223b8d..b674943a587 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,13 +1,10 @@ -FROM ubuntu:focal +FROM ubuntu:jammy ARG DEBIAN_FRONTEND=noninteractive # PHP -RUN apt-get update -y - -RUN apt install -y apache2 vim software-properties-common sudo nano - -RUN add-apt-repository ppa:ondrej/php +RUN apt-get update -y && \ + apt install -y apache2 vim software-properties-common sudo nano RUN apt-get install --no-install-recommends -y \ php8.1 \ @@ -39,8 +36,8 @@ RUN apt-get install --no-install-recommends -y \ nodejs \ npm -RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini -RUN echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini +RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \ + echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini # Autostart XDebug for apache RUN { \ @@ -54,14 +51,14 @@ RUN apt-get -y install \ ca-certificates \ curl \ gnupg-agent \ - software-properties-common -RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - -RUN add-apt-repository \ + software-properties-common && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ + add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ $(lsb_release -cs) \ - stable" -RUN apt-get update -y -RUN apt-get install -y docker-ce docker-ce-cli containerd.io -RUN ln -s /var/run/docker-host.sock /var/run/docker.sock + stable" && \ + apt-get update -y && \ + apt-get install -y docker-ce docker-ce-cli containerd.io && \ + ln -s /var/run/docker-host.sock /var/run/docker.sock WORKDIR /var/www/html |