Skip to content

Commit 129a846

Browse files
authored
Merge pull request #18 from abkfenris/pin-tomcat
Pin the underlying Tomcat image by hash to increase reproducability.
2 parents a581871 + fa16b78 commit 129a846

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM unidata/tomcat-docker:8.5
1+
FROM unidata/tomcat-docker:8.5@sha256:1a5fb1b4407075613c2d8aea0b23b25a10733ffe755e367b1d4dfc8f96249023
22
LABEL maintainer="Kyle Wilcox <kyle@axiomdatascience.com>"
33

44
ENV ERDDAP_VERSION 2.10

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ Available versions:
1212

1313
See all versions available [here](https://hub.docker.com/r/axiom/docker-erddap/tags). As always, consult the [ERDDAP Changes](https://coastwatch.pfeg.noaa.gov/erddap/download/changes.html) documentation before upgrading your sever.
1414

15-
The [upstream image](https://github.com/Unidata/tomcat-docker) this project uses replaces tagged images with new images periodcally. Even for release tags.
16-
This makes it impossible for a downsteam project like this to maintain a reliable build process. At any point the upstream image may overwrite the base image
17-
this repository uses with one that does not. It has happened at least 3 times so far. If you find a bug in any of the versions above please
18-
[report it as an issue](https://github.com/axiom-data-science/docker-erddap/issues).
15+
The [upstream image](https://github.com/Unidata/tomcat-docker) this project uses replaces tagged images with new images periodically. Even for release tags.
1916
This repository will **not** back-port changes from the upstream image to existing tags and overwrite them. If you require features from a newer upstream image
2017
(for example - SHA512 password hashes) you will have to wait for the next ERDDAP release which will be built with the newest upstream image.
2118
You can also build this image yourself.

0 commit comments

Comments
 (0)