Skip to content

Commit d5e9306

Browse files
committed
chore: Build auf Gitlab und SBOM Generierung für Flowable Modeler Server (#2071283)
fix build
1 parent f10db8e commit d5e9306

3 files changed

Lines changed: 7 additions & 5 deletions

File tree

.github/workflows/sbom.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
java-version: 13
1919
- name: Install
20-
run: ./mvnw install -V -B --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V
20+
run: ./mvnw clean install -V -B --no-transfer-progress -DskipTests=true -Dmaven.javadoc.skip=true -B -V -Pdistro
2121
- name: Build an image from Dockerfile
2222
run: docker/all-in-one/build.sh ${{ github.ref_name }}
2323

docker/all-in-one/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ COPY assets/flowable-modeler.war.original /opt/tomcat/webapps/flowable-modeler.w
1616
RUN cd /opt/tomcat && chgrp -R tomcat /opt/tomcat && chmod -R g+r conf && chmod g+x conf && chown -R tomcat webapps/ work/ temp/ logs/ \
1717
&& chown tomcat /wait-for-something.sh && chmod +x /wait-for-something.sh
1818

19-
ENV CATALINA_HOME /opt/tomcat
20-
ENV PATH $PATH:$CATALINA_HOME/bin
19+
ENV CATALINA_HOME=/opt/tomcat
20+
ENV PATH=$PATH:$CATALINA_HOME/bin
2121
ENV JAVA_OPTS="-Xms1024M -Xmx1024M -Djava.security.egd=file:/dev/./urandom"
2222

2323
EXPOSE 8080

docker/all-in-one/build.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ mkdir -p $BASE_PWD/assets && rm -f $BASE_PWD/assets/*.original
99

1010
echo "Building Flowable IDM"
1111
cd ../../modules/flowable-ui-idm
12-
mvn -T 1C clean install -DskipTests -Pdocker-deps
12+
mvn -T 1C clean install -DskipTests -Pdistro,docker-deps
1313
STATUS=$?
1414
if [ $STATUS -eq 0 ]
1515
then
@@ -23,7 +23,7 @@ cd $BASE_PWD
2323

2424
echo "Building Flowable Modeler"
2525
cd ../../modules/flowable-ui-modeler
26-
mvn -T 1C clean install -DskipTests -Pdocker-deps
26+
mvn -T 1C clean install -DskipTests -Pdistro,docker-deps
2727
STATUS=$?
2828
if [ $STATUS -eq 0 ]
2929
then
@@ -38,3 +38,5 @@ cd $BASE_PWD
3838
echo "Building Docker image for version: $FLOWABLE_VERSION"
3939

4040
docker build -t adito/flowable:$FLOWABLE_VERSION .
41+
42+
# --load

0 commit comments

Comments
 (0)