Skip to content

Commit 38743c6

Browse files
committed
wip: move CLI installation
1 parent d1a26d3 commit 38743c6

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

extensions/ql-vscode/test/e2e/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ services:
3434
- project-data:/home/coder/project
3535
entrypoint: |
3636
/usr/bin/entrypoint.sh --install-extension GitHub.vscode-codeql
37-
restart: no
37+
restart: "no"
3838
depends_on:
3939
- files-init
4040
files-init:
4141
image: alpine:3.19.0
42-
restart: no
42+
restart: "no"
4343
# Since we're not running the code-server container using the same user as our host user,
4444
# we need to set the permissions on the mounted volumes to match the user inside the container.
4545
entrypoint: |

extensions/ql-vscode/test/e2e/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ RUN apt-get update \
88
&& rm -rf /var/lib/apt/lists/*
99

1010
RUN wget -O /tmp/codeql.zip https://github.com/github/codeql-cli-binaries/releases/download/v2.15.5/codeql-linux64.zip \
11-
&& unzip /tmp/codeql.zip -d /usr/local/bin \
11+
&& unzip /tmp/codeql.zip -d /opt \
1212
&& rm -rf /tmp/codeql.zip
1313

14-
ENV PATH="/usr/local/bin/codeql:${PATH}"
14+
ENV PATH="/opt/codeql:${PATH}"
1515

1616
USER 1000
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"workbench.startupEditor": "none",
3-
"security.workspace.trust.enabled": false
3+
"security.workspace.trust.enabled": false,
4+
"codeQL.cli.executablePath": "/opt/codeql/codeql"
45
}

0 commit comments

Comments
 (0)