Skip to content

Commit

Permalink
Change start script to run as ENTRYPOINT and call the cadc start script
Browse files Browse the repository at this point in the history
  • Loading branch information
stvoutsin committed Jul 23, 2024
1 parent 7a3d180 commit 3be9b9e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ Find changes for the upcoming release in the project's [changelog.d](https://git

<!-- scriv-insert-here -->

<a id='changelog-2.4.3'></a>
## 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

<a id='changelog-2.4.2'></a>
## 2.4.2 (2024-07-15)

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.lsst-tap-service
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 2 additions & 0 deletions docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3be9b9e

Please sign in to comment.