Skip to content

Commit c7e712d

Browse files
committed
Include sbt in container
Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent 3aed342 commit c7e712d

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.github/workflows/container-tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
cd repotests/play-samples/play-scala-rest-api-example
6767
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -t ghcr.io/appthreat/atom:main scala --version
6868
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -t ghcr.io/appthreat/atom:main scalac --version
69+
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -t ghcr.io/appthreat/atom:main sbt --version
6970
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -t ghcr.io/appthreat/atom:main scalasem /app /app/semantics.slices.json
7071
ls -lh
7172
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -t ghcr.io/appthreat/atom:main atom usages --extract-endpoints -l scala -o /app/app.atom -s /app/usages.slices.json /app

ci/Dockerfile

+8-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ LABEL maintainer="appthreat" \
1414
ARG JAVA_VERSION=23.0.2-tem
1515
ARG MAVEN_VERSION=3.9.9
1616
ARG SCALA_VERSION=3.6.4
17+
ARG SBT_VERSION=1.10.10
1718
ARG RUBY_VERSION=3.4.2
1819

1920
ENV MAVEN_VERSION=$MAVEN_VERSION \
2021
MAVEN_HOME="/opt/maven/${MAVEN_VERSION}" \
2122
SCALA_VERSION=$SCALA_VERSION \
23+
SBT_VERSION=$SBT_VERSION \
2224
SCALA_HOME="/opt/scala/${SCALA_VERSION}" \
25+
SBT_HOME="/opt/sbt/${SBT_VERSION}" \
2326
ANDROID_HOME=/opt/android-sdk-linux \
2427
JAVA_VERSION=$JAVA_VERSION \
2528
JAVA_HOME="/opt/java/${JAVA_VERSION}" \
@@ -36,7 +39,7 @@ ENV MAVEN_VERSION=$MAVEN_VERSION \
3639
RUBY_BUILD_BUILD_PATH="/tmp/rbenv" \
3740
RUBY_BUILD_HTTP_CLIENT=curl
3841

39-
ENV PATH=/opt/bin:/opt/vendor/bin:${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${SCALA_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:/root/.rbenv/bin:/root/.rbenv/versions/3.4.2/bin:
42+
ENV PATH=/opt/bin:/opt/vendor/bin:${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${SCALA_HOME}/bin:${SBT_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:/root/.rbenv/bin:/root/.rbenv/versions/3.4.2/bin:
4043

4144
WORKDIR /opt
4245

@@ -66,9 +69,13 @@ RUN set -e; \
6669
&& sdk install java $JAVA_VERSION \
6770
&& sdk install maven $MAVEN_VERSION \
6871
&& sdk install scala $SCALA_VERSION \
72+
&& sdk install sbt $SBT_VERSION \
6973
&& sdk offline enable \
7074
&& mv /root/.sdkman/candidates/* /opt/ \
7175
&& rm -rf /root/.sdkman \
76+
&& java --version \
77+
&& scalac --version \
78+
&& sbt --version \
7279
&& git clone https://github.com/rbenv/rbenv.git --depth=1 ~/.rbenv \
7380
&& echo 'export PATH="/root/.rbenv/bin:$PATH"' >> ~/.bashrc \
7481
&& echo 'eval "$(/root/.rbenv/bin/rbenv init - bash)"' >> ~/.bashrc \

0 commit comments

Comments
 (0)