diff --git a/CHANGELOG.md b/CHANGELOG.md index e3fb3a0..68707c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ Find changes for the upcoming release in the project's [changelog.d](https://git + +## 2.4.3 (2024-07-18) + +### Fixed + +- Start script now runs as ENTRYPOINT and that triggers the cadc start script. +- Fixes issue where Datalink manifest was not being fetched to /tmp + ## 2.4.2 (2024-07-15) diff --git a/docker/Dockerfile.lsst-tap-service b/docker/Dockerfile.lsst-tap-service index a2b7b9a..332140d 100644 --- a/docker/Dockerfile.lsst-tap-service +++ b/docker/Dockerfile.lsst-tap-service @@ -12,4 +12,4 @@ RUN chmod +x /usr/local/bin/start.sh ADD docker/*.war /usr/share/tomcat/webapps/ # Run the start script to handle the datalink task -RUN /usr/local/bin/start.sh +ENTRYPOINT ["/usr/local/bin/start.sh"] diff --git a/docker/start.sh b/docker/start.sh index 5ea4e56..b895085 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -6,3 +6,5 @@ if [ -n "$DATALINK_PAYLOAD_URL" ]; then curl -L "$DATALINK_PAYLOAD_URL" -o /tmp/datalink_payload.zip unzip /tmp/datalink_payload.zip -d /tmp/datalink fi + +exec /usr/bin/cadc-tomcat-start