Skip to content

Commit

Permalink
Explicitly add server artifact path to runtime module. Required for C…
Browse files Browse the repository at this point in the history
…ekit 3.3.x
  • Loading branch information
ryanemerson committed Aug 5, 2019
1 parent 8558937 commit db26533
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dg-override.yaml
Expand Up @@ -3,7 +3,7 @@ version: 1.0
description: Data Grid Server

# artifacts:
# - name: datagrid-8.0.0-server.zip
# - name: server.zip
# description: TODO
# md5: TODO

Expand Down
2 changes: 1 addition & 1 deletion image.yaml
Expand Up @@ -6,7 +6,7 @@ description: Infinispan Server
from: registry.access.redhat.com/ubi8/ubi-minimal:latest

artifacts:
- name: infinispan-server-10.0.0.Beta4.zip
- name: server.zip
sha1: 0833573669418a6a655f6c5597ea35790e0b3ae7
url: https://downloads.jboss.org/infinispan/10.0.0.Beta4/infinispan-server-10.0.0.Beta4.zip

Expand Down
6 changes: 3 additions & 3 deletions modules/runtime/extract.sh
Expand Up @@ -2,13 +2,13 @@
set -e

ADDED_DIR=$(dirname $0)/added
ARTIFACTS_DIR=/tmp/artifacts
DISTRIBUTION=$(ls $ARTIFACTS_DIR | grep infinispan*)
# Must be the same as artifact name+path defined in module.yaml
ARTIFACT=/tmp/artifacts/server.zip
SERVER_ROOT=/opt/infinispan

mkdir -p $SERVER_ROOT
cd $SERVER_ROOT
bsdtar --strip-components=1 -xvf $ARTIFACTS_DIR/$DISTRIBUTION
bsdtar --strip-components=1 -xvf $ARTIFACT

cp $ADDED_DIR/launch.sh $SERVER_ROOT/bin
cp $ADDED_DIR/java-opts.sh $SERVER_ROOT/bin
Expand Down
4 changes: 4 additions & 0 deletions modules/runtime/module.yaml
Expand Up @@ -3,5 +3,9 @@ schema_version: 1
name: runtime
version: 1.0

artifacts:
- name: server.zip
path: /tmp/artifacts

execute:
- script: extract.sh

0 comments on commit db26533

Please sign in to comment.