Skip to content

Commit a1a8b39

Browse files
committed
Hardcode a few bits for this particular esvee version
1 parent d9bbeea commit a1a8b39

File tree

3 files changed

+43
-1
lines changed

3 files changed

+43
-1
lines changed

.github/workflows/release.yml

+10
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,22 @@ jobs:
3636
registry: ghcr.io
3737
username: ${{ github.actor }}
3838
password: ${{ secrets.GITHUB_TOKEN }}
39+
# - name: Get git tag tool and version
40+
# run: |
41+
# TAG=${GITHUB_REF#refs/tags/}
42+
# TOOL=${TAG%-*}
43+
# VERSION=${TAG#*-}
44+
# echo "TOOL=$TOOL" >> $GITHUB_ENV
45+
# echo "VERSION=$VERSION" >> $GITHUB_ENV
3946
- name: Docker GitHub release
4047
uses: docker/build-push-action@v6
4148
with:
4249
context: .
4350
provenance: false
4451
file: ./esvee/Dockerfile
4552
platforms: ${{ matrix.platforms }}
53+
# build-args: VERSION=$VERSION
54+
build-args: VERSION=1.0.2
4655
push: true
56+
# tags: ghcr.io/umccr/hmftools-$TOOL:$VERSION-aarch64
4757
tags: ghcr.io/umccr/hmftools-esvee:1.0.2-aarch64

esvee/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ ARG RUN_SCRIPT=/usr/local/bin/${TOOL_NAME}
88
USER root
99

1010
ADD target/${TOOL_NAME}-${VERSION}-jar-with-dependencies.jar ${JAR}
11-
ADD entrypoint.sh ${RUN_SCRIPT}
11+
#ADD entrypoint.sh ${RUN_SCRIPT}
12+
ADD ./esvee/entrypoint.sh ${RUN_SCRIPT}
1213
RUN chmod +x ${RUN_SCRIPT}
1314

1415
RUN micromamba install -y -n base -c bioconda -c conda-forge \

esvee/entrypoint.sh

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
4+
TOOL="esvee"
5+
VERSION="1.0.2"
6+
7+
# Parse arguments
8+
jvm_mem_opts=""
9+
jvm_gen_opts=""
10+
declare -a app_args
11+
for arg in "$@"; do
12+
case ${arg} in
13+
'-Xm'*)
14+
jvm_mem_opts="${jvm_mem_opts} ${arg}"
15+
;;
16+
'-D'* | '-XX'*)
17+
jvm_gen_opts="${jvm_gen_opts} ${arg}"
18+
;;
19+
*)
20+
app_args+=("${arg}")
21+
;;
22+
esac
23+
done
24+
25+
# Form and execute command
26+
if [[ ${app_args[0]:=} == com.hartwig.* ]]; then
27+
java ${jvm_mem_opts} ${jvm_gen_opts} -cp /usr/share/java/${TOOL}_v${VERSION}.jar ${app_args[@]}
28+
else
29+
java ${jvm_mem_opts} ${jvm_gen_opts} -jar /usr/share/java/${TOOL}_v${VERSION}.jar ${app_args[@]}
30+
fi
31+

0 commit comments

Comments
 (0)