Skip to content

Commit c32301f

Browse files
author
Your Name
committed
Update to support ghidra-11.2.1
1 parent 6745b93 commit c32301f

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
################################################################################
22
# LIGHTKEEPER #
33
################################################################################
4-
FROM ubuntu:20.04 AS lightkeeper
4+
FROM ubuntu:24.04 AS lightkeeper
55
ARG http_proxy
66
ARG https_proxy
77

@@ -12,16 +12,16 @@ ENV DEBIAN_FRONTEND="noninteractive"
1212

1313
RUN apt-get update && \
1414
apt-get install -y \
15-
openjdk-17-jdk \
15+
openjdk-21-jdk \
1616
wget \
1717
unzip \
1818
curl \
1919
git
2020

2121
# GHIDRA
22-
ENV GHIDRA_URL=https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.1.1_build/ghidra_11.1.1_PUBLIC_20240614.zip
23-
ENV GHIDRA_ZIP=ghidra_11.1.1_PUBLIC_20240614.zip
24-
ENV GHIDRA_DIR=ghidra_11.1.1_PUBLIC
22+
ENV GHIDRA_URL=https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.2.1_build/ghidra_11.2.1_PUBLIC_20241105.zip
23+
ENV GHIDRA_ZIP=ghidra_11.2.1_PUBLIC_20241105.zip
24+
ENV GHIDRA_DIR=ghidra_11.2.1_PUBLIC
2525
RUN wget $GHIDRA_URL
2626
RUN unzip -d /opt $GHIDRA_ZIP
2727

@@ -31,11 +31,3 @@ ENV GRADLE_ZIP=gradle-8.11.1-bin.zip
3131
RUN wget $GRADLE_URL
3232
RUN unzip -d /opt/gradle $GRADLE_ZIP
3333
ENV PATH=$PATH:/opt/gradle/gradle-8.11.1/bin
34-
35-
# VSCODE
36-
ARG VSCODE_COMMIT_ID
37-
ENV VSCODE_COMMIT_ID=$VSCODE_COMMIT_ID
38-
WORKDIR /root/.vscode-server/bin
39-
RUN curl -sL https://update.code.visualstudio.com/commit:${VSCODE_COMMIT_ID}/server-linux-x64/stable -o stable
40-
RUN tar xf stable
41-
RUN mv vscode-server-linux-x64 ${VSCODE_COMMIT_ID}

.github/workflows/build_on_tag_push.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Ghidra Extension Publish
22

33
env:
4-
ghidra-url: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.1.1_build/ghidra_11.1.1_PUBLIC_20240614.zip
5-
ghidra-zip-filename: ghidra_11.1.1_PUBLIC_20240614.zip
6-
ghidra-directory: ghidra_11.1.1_PUBLIC
4+
ghidra-url: https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_11.2.1_build/ghidra_11.2.1_PUBLIC_20241105.zip
5+
ghidra-zip-filename: ghidra_11.2.1_PUBLIC_20241105.zip
6+
ghidra-directory: ghidra_11.2.1_PUBLIC
77

88
on:
99
push:
@@ -12,14 +12,14 @@ on:
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616

1717
steps:
1818
- uses: actions/checkout@v2
1919
- uses: actions/setup-java@v3
2020
with:
2121
distribution: 'temurin'
22-
java-version: '17'
22+
java-version: '21'
2323
cache: 'gradle'
2424

2525
- name: Get the version

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
"label": "Build",
66
"type": "shell",
7-
"command": "gradle -PGHIDRA_INSTALL_DIR=/opt/ghidra_11.1.1_PUBLIC",
7+
"command": "gradle -PGHIDRA_INSTALL_DIR=/opt/ghidra_11.2.1_PUBLIC",
88
"group": "build",
99
"options": {
1010
"cwd": "${workspaceFolder}/lightkeeper"
@@ -18,7 +18,7 @@
1818
{
1919
"label": "Build Image",
2020
"type": "shell",
21-
"command": "docker buildx build --build-arg VSCODE_COMMIT_ID=$(code --version |sed -n '2p') -f .devcontainer/Dockerfile -t lightkeeper --target lightkeeper ${workspaceFolder}",
21+
"command": "docker buildx build -f .devcontainer/Dockerfile -t lightkeeper --target lightkeeper ${workspaceFolder}",
2222
"group": "build",
2323
"options": {
2424
"cwd": "${workspaceFolder}"

0 commit comments

Comments
 (0)