Skip to content

Commit

Permalink
DEVEX-2419 release dxCompiler 2.11.8
Browse files Browse the repository at this point in the history
(fix) docker.env - revert
(fix) docker_test.env - revert/delete
(fix) test.sh - revert
(fix) Dockerfile - correct path
  • Loading branch information
Gvaihir committed Oct 23, 2024
1 parent acfd5fa commit cef4ad0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
3 changes: 2 additions & 1 deletion scripts/docker_image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM amazoncorretto:11
ARG VERSION
ARG BASE_DIR

COPY dxCompiler-$VERSION.jar /dxCompiler.jar
COPY ${BASE_DIR}/dxCompiler-$VERSION.jar /dxCompiler.jar

ENTRYPOINT ["java", "-jar", "/dxCompiler.jar"]
2 changes: 1 addition & 1 deletion scripts/docker_image/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ rm -f "${base_dir}/dxCompiler-${VERSION}.jar"
wget https://github.com/dnanexus/dxCompiler/releases/download/${VERSION}/dxCompiler-${VERSION}.jar -O "${base_dir}/dxCompiler-${VERSION}.jar"

# echo "Building Docker image"
docker build -f "${base_dir}/Dockerfile" --build-arg VERSION=${VERSION} -t dnanexus/dxcompiler:${VERSION} .
docker build -f "${base_dir}/Dockerfile" --build-arg VERSION=${VERSION} BASE_DIR=${base_dir} -t dnanexus/dxcompiler:${VERSION} .
3 changes: 0 additions & 3 deletions scripts/docker_image/docker_test.env

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/docker_image/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -euo pipefail
# Find the root directory of the distribution, regardless of where
# the script is called from
base_dir=$(dirname "$0")
source "${base_dir}/docker_test.env"
source "${base_dir}/docker.env"

if [[ -z "${VERSION}" ]]; then
echo "Specify the dxCompiler version in docker.env"
Expand Down

0 comments on commit cef4ad0

Please sign in to comment.