Merge pull request #34 from Ilyes512/remove-vscode-target

Removed vscode target

Author: Ilyes512

.github/workflows/main.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.3.0
     strategy:
       fail-fast: false
       matrix:
@@ -39,7 +39,7 @@ jobs:
         ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}
 
   merge:
-    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.3.0
     needs: build
     strategy:
       matrix:

.github/workflows/pr.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   build:
-    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.3.0
     strategy:
       fail-fast: false
       matrix:
@@ -39,7 +39,7 @@ jobs:
         ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-main-
 
   merge:
-    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.3.0
     needs: build
     strategy:
       matrix:

.github/workflows/tag.yml

@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   build:
-    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/build-php.yml@0.3.0
     strategy:
       fail-fast: false
       matrix:
@@ -40,7 +40,7 @@ jobs:
         ${{ matrix.os }}-buildx-${{ matrix.platform }}-${{ matrix.docker.key }}-
 
   merge:
-    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.2.2
+    uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@0.3.0
     needs: build
     strategy:
       matrix:

README.md

@@ -10,17 +10,15 @@ A PHP 8.3 (FPM and Apache) based Docker base image.
 docker pull ghcr.io/ilyes512/php83:runtime-latest
 docker pull ghcr.io/ilyes512/php83:builder-latest
 docker pull ghcr.io/ilyes512/php83:builder-nodejs-latest
-docker pull ghcr.io/ilyes512/php83:vscode-latest
 
 docker pull ghcr.io/ilyes512/php83/apache:runtime-latest
 docker pull ghcr.io/ilyes512/php83/apache:builder-latest
 docker pull ghcr.io/ilyes512/php83/apache:builder-nodejs-latest
-docker pull ghcr.io/ilyes512/php83/apache:vscode-latest
 ```
 
 The tag scheme: `{TARGET}-{VERSION}`
 
-- **{TARGET}**: `runtime`, `builder`, `builder_nodejs` or `vscode`
+- **{TARGET}**: `runtime`, `builder` or `builder_nodejs`
 - **{VERSION}**: `latest` or tag i.e. `1.0.0`
 
 ## Building the docker image(s)
@@ -30,9 +28,6 @@ There are multiple targets:
   - **runtime**: this is for *production*. It does not contain any development tools like Composer and Xdebug.
   - **builder**: this is for *development*. This is based on the runtime-target and it adds Composer, Xdebug etc.
   - **builder_nodejs**: this is for *development*. This is based on the builder-target and it adds NodeJS.
-  - **vscode**: this is for *development* using
-  [VS Code Remote](https://code.visualstudio.com/docs/remote/remote-overview). This is based on the
-  `builder_nodejs`-target and adds some VS Code deps.
 
 Building `runtime`-target:
 
@@ -52,12 +47,6 @@ Building `builder_nodejs`-target:
 docker build --tag ghcr.io/ilyes512/php83:builder-nodejs-latest --file fpm/Dockerfile --target builder_nodejs .
 ```
 
-Building `vscode`-target:
-
-```
-docker build --tag ghcr.io/ilyes512/php83:vscode-latest --file fpm/Dockerfile --target vscode .
-```
-
 ## Task commands
 
 Available [Task](https://taskfile.dev/#/) commands:

Taskfile.dist.yml

@@ -41,11 +41,6 @@ tasks:
           TARGET: builder_nodejs
           DOCKER_IMAGE_NAME: '{{.DOCKER_IMAGE_NAME}}'
           DOCKER_FILE_PATH: '{{.DOCKER_FILE_PATH}}'
-      - task: build:target
-        vars:
-          TARGET: vscode
-          DOCKER_IMAGE_NAME: '{{.DOCKER_IMAGE_NAME}}'
-          DOCKER_FILE_PATH: '{{.DOCKER_FILE_PATH}}'
 
   build:apache:
     desc: Build all PHP Docker image targets of the Apache variant
@@ -69,20 +64,14 @@ tasks:
           TARGET: builder_nodejs
           DOCKER_IMAGE_NAME: '{{.DOCKER_IMAGE_NAME}}'
           DOCKER_FILE_PATH: '{{.DOCKER_FILE_PATH}}'
-      - task: build:target
-        vars:
-          TARGET: vscode
-          DOCKER_IMAGE_NAME: '{{.DOCKER_IMAGE_NAME}}'
-          DOCKER_FILE_PATH: '{{.DOCKER_FILE_PATH}}'
 
   build:target:
     preconditions:
       - sh: >
           test '{{.TARGET}}' = 'runtime'
           -o '{{.TARGET}}' = 'builder'
           -o '{{.TARGET}}' = 'builder_nodejs'
-          -o '{{.TARGET}}' = 'vscode'
-        msg: TARGET needs to contain the Docker TARGET [runtime, builder, builder_nodejs, vscode]
+        msg: TARGET needs to contain the Docker TARGET [runtime, builder, builder_nodejs]
     vars:
       VERSION: '{{.VERSION | default "latest"}}'
     cmds:

apache/Dockerfile

@@ -194,23 +194,3 @@ RUN apt-get update \
     && apt-get clean --assume-yes \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/*
-
-FROM builder_nodejs AS vscode
-
-ARG UNIQUE_ID_FOR_CACHEFROM=vscode
-
-RUN apt-get update \
-    && apt-get install --assume-yes --no-install-recommends \
-        openssh-client \
-        sudo \
-        # VSCode Live Share Extension dependencies
-        libicu72 \
-        libkrb5-3 \
-        zlib1g \
-        gnome-keyring \
-        libsecret-1-0 \
-        desktop-file-utils \
-        x11-utils \
-    && apt-get autoremove --assume-yes \
-    && apt-get clean --assume-yes \
-    && rm -rf /var/lib/apt/lists/*

fpm/Dockerfile

@@ -194,23 +194,3 @@ RUN apt-get update \
     && apt-get clean --assume-yes \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /tmp/*
-
-FROM builder_nodejs AS vscode
-
-ARG UNIQUE_ID_FOR_CACHEFROM=vscode
-
-RUN apt-get update \
-    && apt-get install --assume-yes --no-install-recommends \
-        openssh-client \
-        sudo \
-        # VSCode Live Share Extension dependencies
-        libicu72 \
-        libkrb5-3 \
-        zlib1g \
-        gnome-keyring \
-        libsecret-1-0 \
-        desktop-file-utils \
-        x11-utils \
-    && apt-get autoremove --assume-yes \
-    && apt-get clean --assume-yes \
-    && rm -rf /var/lib/apt/lists/*