Skip to content

Commit f632b80

Browse files
authored
Adding TypeScript Support and Removing github/codeql-go References (#50)
* install nodejs * remove references to moved codeql-go-repo * remove go-repo directory
1 parent 14d7b87 commit f632b80

File tree

1 file changed

+27
-30
lines changed

1 file changed

+27
-30
lines changed

Dockerfile

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,33 @@ RUN adduser --home ${CODEQL_HOME} ${USERNAME} && \
1212
apt-get update && \
1313
apt-get upgrade -y && \
1414
apt-get install -y --no-install-recommends \
15-
software-properties-common \
16-
vim \
17-
curl \
18-
wget \
19-
git \
20-
build-essential \
21-
unzip \
22-
apt-transport-https \
23-
python3.8 \
24-
python3-venv \
25-
python3-pip \
26-
python3-setuptools \
27-
python3-dev \
28-
gnupg \
29-
g++ \
30-
make \
31-
gcc \
32-
apt-utils \
33-
rsync \
34-
file \
35-
dos2unix \
36-
gettext && \
37-
apt-get clean && \
38-
rm -f /usr/bin/python /usr/bin/pip && \
39-
ln -s /usr/bin/python3.8 /usr/bin/python && \
40-
ln -s /usr/bin/pip3 /usr/bin/pip
15+
software-properties-common \
16+
nodejs \
17+
vim \
18+
curl \
19+
wget \
20+
git \
21+
build-essential \
22+
unzip \
23+
apt-transport-https \
24+
python3.8 \
25+
python3-venv \
26+
python3-pip \
27+
python3-setuptools \
28+
python3-dev \
29+
gnupg \
30+
g++ \
31+
make \
32+
gcc \
33+
apt-utils \
34+
rsync \
35+
file \
36+
dos2unix \
37+
gettext && \
38+
apt-get clean && \
39+
rm -f /usr/bin/python /usr/bin/pip && \
40+
ln -s /usr/bin/python3.8 /usr/bin/python && \
41+
ln -s /usr/bin/pip3 /usr/bin/pip
4142

4243
# Install .NET Core and Java for tools/builds
4344
RUN cd /tmp && \
@@ -63,14 +64,11 @@ RUN pip3 install --upgrade pip \
6364
RUN python3 /usr/local/startup_scripts/get-latest-codeql-version.py > /tmp/codeql_version
6465
RUN mkdir -p \
6566
${CODEQL_HOME}/codeql-repo \
66-
${CODEQL_HOME}/codeql-go-repo \
6767
/opt/codeql
6868

6969
# get the latest codeql queries and record the HEAD
7070
RUN git clone --depth 1 https://github.com/github/codeql ${CODEQL_HOME}/codeql-repo && \
7171
git --git-dir ${CODEQL_HOME}/codeql-repo/.git log --pretty=reference -1 > /opt/codeql/codeql-repo-last-commit
72-
RUN git clone --depth 1 https://github.com/github/codeql-go ${CODEQL_HOME}/codeql-go-repo && \
73-
git --git-dir ${CODEQL_HOME}/codeql-go-repo/.git log --pretty=reference -1 > /opt/codeql/codeql-go-repo-last-commit
7472

7573
RUN CODEQL_VERSION=$(cat /tmp/codeql_version) && \
7674
wget -q https://github.com/github/codeql-cli-binaries/releases/download/${CODEQL_VERSION}/codeql-linux64.zip -O /tmp/codeql_linux.zip && \
@@ -81,7 +79,6 @@ ENV PATH="${CODEQL_HOME}/codeql:${PATH}"
8179

8280
# Pre-compile our queries to save time later
8381
RUN codeql query compile --threads=0 ${CODEQL_HOME}/codeql-repo/*/ql/src/codeql-suites/*.qls --additional-packs=.
84-
RUN codeql query compile --threads=0 ${CODEQL_HOME}/codeql-go-repo/ql/src/codeql-suites/*.qls --additional-packs=.
8582

8683
ENV PYTHONIOENCODING=utf-8
8784

0 commit comments

Comments
 (0)