Skip to content

Commit

Permalink
use parent pom
Browse files Browse the repository at this point in the history
  • Loading branch information
terrywbrady committed Jun 20, 2023
1 parent e716fea commit 3a394ae
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
1 change: 1 addition & 0 deletions bin/local_maven_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ export ECR_REGISTRY=it-docker-registry
export SSM_SKIP_RESOLUTION=Y

cd $REPOS_DIR
mvn clean install -f dep_core/mrt-core2/parprop/
mvn clean install
1 change: 1 addition & 0 deletions bin/maven_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ echo "ECR_REGISTRY must be set"
echo "ECR_REGISTRY=${ECR_REGISTRY}"

cd $REPOS_DIR
mvn clean install -f dep_core/mrt-core2/parprop/
mvn clean install
9 changes: 0 additions & 9 deletions mrt-services/dep_cdlmvn/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ WORKDIR /build

RUN mkdir -p static

# storage uses this
# RUN mvn dependency:get -Dmaven.legacyLocalRepo=true -DgroupId=net.sf -DartifactId=jargs -Dversion=1.0 -Dpackaging=jar \
# -DrepoUrl=https://mvn.cdlib.org/content/repositories/public/

# Used by several repos
# RUN mvn dependency:get -Dmaven.legacyLocalRepo=true -DgroupId=org.cdlib.mrt -DartifactId=mrt-jena -Dversion=1.0-SNAPSHOT \
# -Dpackaging=jar -DrepoUrl=https://mvn.cdlib.org/content/repositories/cdl-snapshots/

# for OAI and Sword, mock the conf file creation until those services are migrated to use SSM
WORKDIR /build/mysqlconf

ADD . /build/mysqlconf/
Expand Down
1 change: 1 addition & 0 deletions mrt-services/dep_core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ADD mrt-core2 ./

# Build and clean in one step to keep the image size small
RUN mkdir appdir && \
mvn install -Pparent && \
mvn install -DskipTests && \
date -r core/target +'dep-core: %Y-%m-%d:%H:%M:%S' >> /build/static/build.content.txt && \
cp */target/*.jar appdir && \
Expand Down

0 comments on commit 3a394ae

Please sign in to comment.