Skip to content

Commit

Permalink
Use java version of atom in the image (#117)
Browse files Browse the repository at this point in the history
Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
  • Loading branch information
prabhu authored Jan 14, 2024
1 parent 18865b5 commit 2ce6ec4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name := "atom"
ThisBuild / organization := "io.appthreat"
ThisBuild / version := "2.0.2"
ThisBuild / version := "2.0.3"
ThisBuild / scalaVersion := "3.3.1"

val chenVersion = "2.0.2"
Expand Down
4 changes: 2 additions & 2 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV JAVA_VERSION=$JAVA_VERSION \
PHP_PARSER_BIN=/opt/vendor/bin/php-parse \
COMPOSER_ALLOW_SUPERUSER=1

ENV PATH=${PATH}:/opt/bin:/opt/vendor/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:
ENV PATH=/opt/bin:/opt/vendor/bin:${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:/usr/local/bin/:/root/.local/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:

WORKDIR /opt

Expand Down Expand Up @@ -76,7 +76,7 @@ RUN unzip -q atom.zip \
&& composer update --no-progress --prefer-dist --ignore-platform-reqs \
&& cd /opt/nodejs && npm install --only=production && cd /opt \
&& sudo npm install -g /opt/nodejs \
&& rm -rf atom.zip composer.json composer.lock composer-setup.php \
&& rm -rf atom.zip composer.json composer.lock composer-setup.php /usr/local/bin/atom \
&& /opt/bin/atom --help \
&& which astgen \
&& which phpastgen \
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"downloadUrl": "https://github.com/AppThreat/atom",
"issueTracker": "https://github.com/AppThreat/atom/issues",
"name": "atom",
"version": "2.0.2",
"version": "2.0.3",
"description": "Atom is a novel intermediate representation for next-generation code analysis.",
"applicationCategory": "code-analysis",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions wrapper/nodejs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wrapper/nodejs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appthreat/atom",
"version": "2.0.2",
"version": "2.0.3",
"description": "Create atom (⚛) representation for your application, packages and libraries",
"exports": "./index.js",
"type": "module",
Expand Down

0 comments on commit 2ce6ec4

Please sign in to comment.