Skip to content
This repository was archived by the owner on Jan 22, 2022. It is now read-only.

Commit 36358b6

Browse files
committed
for 5.3.8 LTS releases
1 parent 1bf7174 commit 36358b6

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

images/dotcms/Dockerfile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ARG BUILD_FROM=COMMIT
1313
ARG BUILD_ID=HEAD
1414

1515
# Tomcat version
16-
ARG TOMCAT_VERSION=""
16+
ARG TOMCAT_VERSION="5.3.8.4"
1717

1818
WORKDIR /srv
1919

@@ -77,6 +77,20 @@ ENV SERVICE_DELAY_DEFAULT_MIN 1
7777
ENV SERVICE_DELAY_DEFAULT_STEP 3
7878
ENV SERVICE_DELAY_DEFAULT_MAX 30
7979

80+
RUN echo "copying jars"
81+
82+
83+
# Update JARS to work with ARM compatiable JARs
84+
RUN rm /srv/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/lib/jsass*.jar
85+
RUN rm /srv/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/lib/dot.webp-imageio-core*.jar
86+
87+
RUN wget --quiet https://repo.dotcms.com/artifactory/MavenCentral-cache/io/bit3/jsass/5.10.3/jsass-5.10.3.jar
88+
RUN wget --quiet https://repo.dotcms.com/artifactory/ext-release-local/com/dotcms/lib/dot.webp-imageio-core/0.1.5/dot.webp-imageio-core-0.1.5.jar
89+
90+
91+
RUN mv *.jar /srv/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/lib/
92+
RUN rm -rf /root
93+
8094
#VOLUME /data/local
8195

8296
## Ports

images/dotcms/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ docker buildx use multiarch
8383
At this point, you can use `buildx` to build your image and target the platform(s) you want to build for. Mostly, the same arguements apply, though `buildx` also allows you to immediatly push your new image to docker hub after it is built.
8484

8585
```
86-
docker buildx build --platform linux/amd64,linux/arm64 --pull --push --build-arg BUILD_FROM=COMMIT --build-arg BUILD_ID=origin/master -t dotcms/dotcms:multiarch-test .
86+
docker buildx build --platform linux/amd64,linux/arm64 --pull --push --progress plain --build-arg BUILD_FROM=COMMIT --build-arg BUILD_ID=origin/release-5.3.8.4 -t dotcms/dotcms:5.3.8.4.aarch .
8787
8888
```

images/dotcms/build-src/build_dotcms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ build_by_commit() {
4040
git checkout ${1}
4141
fi
4242

43-
cd dotCMS && ./gradlew --stacktrace clonePullTomcatDist createDistPrep -PuseGradleNode=false
43+
cd dotCMS && ./gradlew clonePullTomcatDist createDistPrep -PuseGradleNode=false
4444
find ../dist/ -name "*.sh" -exec chmod 500 {} \;
4545
mv ../dist/* "${build_target_dir}"
4646
}

0 commit comments

Comments
 (0)