Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

July 2024 update #346

Merged
merged 10 commits into from
Aug 2, 2024
Merged

July 2024 update #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b30bf6
July 2024 Updates - ActiveMQ 5.x upgrade
g7morris Jul 31, 2024
c926520
July 2024 Updates - FCREPO README.md correction
g7morris Jul 31, 2024
85afc61
July 2024 Updates - FITSERVLET & LOG4J upgrades
g7morris Jul 31, 2024
abe76a8
July 2024 Updates - SOLR README.md correction
g7morris Jul 31, 2024
d1d0690
July 2024 Updates - Tomcat upgrade
g7morris Jul 31, 2024
9db14f0
July 2024 Updates - NGINX README.md correction
g7morris Aug 1, 2024
dc78854
July 2024 Updates - Mariadb README.md correction
g7morris Aug 1, 2024
180ee54
July 2024 Updates - Postgresql README.md correction
g7morris Aug 1, 2024
274c55c
July 2024 Updates - Handle upgrade
g7morris Aug 1, 2024
62dfdb7
July 2024 Updates - NGINX README.md correction redux
g7morris Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions activemq/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
FROM java

ARG TARGETARCH
ARG ACTIVEMQ_VERSION="5.18.3"
ARG ACTIVEMQ_VERSION="5.18.5"
ARG ACTIVEMQ_FILE="apache-activemq-${ACTIVEMQ_VERSION}-bin.tar.gz"
ARG ACTIVEMQ_URL="https://archive.apache.org/dist/activemq/${ACTIVEMQ_VERSION}/${ACTIVEMQ_FILE}"
ARG ACTIVEMQ_FILE_SHA256="943381aa6d340707de6c42eadbf7b41b7fdf93df604156d972d50c4da783544f"
ARG ACTIVEMQ_FILE_SHA256="1190b809a35ceb5fb0273f4a47d4584684d75c43360942be10d9af1fc0a39394"

EXPOSE 61616 5672 61613 1883 61614 8161

Expand Down
2 changes: 1 addition & 1 deletion activemq/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ActiveMQ

Docker image for [ActiveMQ] version 5.17.6.
Docker image for [ActiveMQ] version 5.18.5.

Please refer to the [ActiveMQ Documentation] for more in-depth information.

Expand Down
2 changes: 1 addition & 1 deletion fcrepo6/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fcrepo

Docker image for [fcrepo] version 6.4.1.
Docker image for [fcrepo] version 6.5.0

Please refer to the [Fcrepo Documentation] for more in-depth information.

Expand Down
6 changes: 3 additions & 3 deletions fits/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ ARG FITS_FILE="fits-${FITS_VERSION}.zip"
ARG FITS_URL="https://github.com/harvard-lts/fits/releases/download/${FITS_VERSION}/${FITS_FILE}"
ARG FITS_SHA256="32e436effe7251c5b067ec3f02321d5baf4944b3f0d1010fb8ec42039d9e3b73"

ARG LOG4J_VERSION="2.22.0"
ARG LOG4J_VERSION="2.23.1"
ARG LOG4J_FILE="apache-log4j-${LOG4J_VERSION}-bin.zip"
ARG LOG4J_URL="https://archive.apache.org/dist/logging/log4j/${LOG4J_VERSION}/${LOG4J_FILE}"
ARG LOG4J_FILE_SHA256="c6d61ecf2563b1200e02587b89b7c75b58b6e62e6a16cdb6f333c2482167c2dc"
ARG OLD_LOG4J_VERSION="2.17.1"
ARG LOG4J_FILE_SHA256="c53645414ce68f21dd347439df5852ad16b38cd7227a9d417ebaf411a1c09501"
ARG OLD_LOG4J_VERSION="2.22.0"

# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=fits-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
Expand Down
2 changes: 1 addition & 1 deletion fits/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fits

Docker image for [Fits](https://projects.iq.harvard.edu/fits/home) version 1.5.5.
Docker image for [Fits](https://projects.iq.harvard.edu/fits/home) version 1.6.0.

Please refer to the [Fits Documentation] for more in-depth information.

Expand Down
12 changes: 6 additions & 6 deletions handle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
FROM java

ARG TARGETARCH
ARG HANDLE_VERSION="9.3.0"
ARG HANDLE_VERSION="9.3.1"
ARG HANDLE_FILE="handle-${HANDLE_VERSION}-distribution.tar.gz"
ARG HANDLE_URL="http://handle.net/hnr-source/${HANDLE_FILE}"
ARG HANDLE_FILE_SHA256="7bbf155842b098df9eb3e6e24778be23bc74365cf0f2b1b2acb0ae111a54bdaf"
ARG HANDLE_FILE_SHA256="03c659511acb0f11a89d7f8993f47b156c3b93b288ef64a3170e09a32c526417"

ARG MYSQL_DRIVER_VERSION="8.0.31"
ARG MYSQL_DRIVER_VERSION="9.0.0"
ARG MYSQL_DRIVER_FILE="mysql-connector-j-${MYSQL_DRIVER_VERSION}.tar.gz"
ARG MYSQL_DRIVER_URL="https://dev.mysql.com/get/Downloads/Connector-J/${MYSQL_DRIVER_FILE}"
ARG MYSQL_DRIVER_FILE_SHA256="03e3908f070bfe216f0458c8c4de0b3e47ed3182b37d39bcd2082dbd767d5f91"
ARG MYSQL_DRIVER_FILE_SHA256="02cd65cfa7ba61db415479bc3ff14cd86f63698971756abc7d9c9beb6331d99f"

ARG POSTGRES_DRIVER_VERSION="42.5.1"
ARG POSTGRES_DRIVER_VERSION="42.7.3"
ARG POSTGRES_DRIVER_FILE="postgresql-${POSTGRES_DRIVER_VERSION}.jar"
ARG POSTGRES_DRIVER_URL="https://jdbc.postgresql.org/download/${POSTGRES_DRIVER_FILE}"
ARG POSTGRES_DRIVER_FILE_SHA256="89e8bffa8b37b9487946012c690cf04f3103953051c1c193d88ee36b68d365ae"
ARG POSTGRES_DRIVER_FILE_SHA256="a2644cbfba1baa145ff7e8c8ef582a6eed7a7ec4ca792f7f054122bdec756268"

EXPOSE 8000/tcp 2641/tcp 2641/udp

Expand Down
2 changes: 1 addition & 1 deletion handle/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Handle

Docker image for [Handle] version 9.3.0.
Docker image for [Handle] version 9.3.1.

Please refer to the [Handle Documentation] for more in-depth information.

Expand Down
4 changes: 2 additions & 2 deletions mariadb/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MariaDB

Docker image for [MariaDB] version 10.6.12
Docker image for [MariaDB] version 10.11.6

Please refer to the [MariaDB Documentation] for more in-depth information.

Expand Down Expand Up @@ -41,7 +41,7 @@ default database connection configuration.
| :------------------- | :------ | :------------------------------------------------------------------------------------ |
| MYSQL_ROOT_PASSWORD | | The database root user password. Defaults to `DB_ROOT_PASSWORD` |
| MYSQL_ROOT_USER | | The database root user (used to create the site database). Defaults to `DB_ROOT_USER` |
| MYSQL_MAX_ALLOWED_PACKET | 16777216 | Max packet length to send to or receive from the server, [documentation](https://mariadb.com/docs/server/ref/mdb/system-variables/max_allowed_packet/)
| MYSQL_MAX_ALLOWED_PACKET | 16777216 | Max packet length to send to or receive from the server, [documentation](https://mariadb.com/docs/server/ref/mdb/system-variables/max_allowed_packet/)
| MYSQL_TRANSACTION_ISOLATION | READ-COMMITTED | The isolation level for transactions.

## Logs
Expand Down
2 changes: 1 addition & 1 deletion nginx/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Nginx

Docker image for [Nginx] version 1.22.1 and [FPM] version 8.1.15.
Docker image for [Nginx] version 1.24.0 and [FPM] version 8.3.8.

Please refer to the [Nginx Documentation] and [FPM Documentation] for more
in-depth information.
Expand Down
2 changes: 1 addition & 1 deletion postgresql/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# PostgreSQL

Docker image for [PostgreSQL] version 15.1
Docker image for [PostgreSQL] version 16.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got 16.2 when I checked.

/ $ postgres --version
postgres (PostgreSQL) 16.2

Copy link
Contributor Author

@g7morris g7morris Aug 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmmm I'm not getting the same results from a fresh build?

  • Reran make clean && make bake && make up

Check 1:

docker run --rm -d --name postgresql islandora/postgresql

docker exec -ti postgresql psql -U root postgres
psql (16.3)
Type "help" for help.

postgres=#

Check 2:

docker exec -ti postgresql bash

6f89c38c08af:/# postgres --version

postgres (PostgreSQL) 16.3

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My local build matches the version from the latest release:

make bake BUILDER=desktop-linux TARGET=postgresql 2&>/dev/null && docker run --rm -ti -u 1 --entrypoint psql islandora/postgresql:local --version
psql (PostgreSQL) 16.2

So, I obliterated all my local builds and then built without access to the cache on DockerHub and got what you have. Which is worrying, I'll open up a ticket to investigate this cache poisoning issue.


Please refer to the [PostgreSQL Documentation] for more in-depth information.

Expand Down
2 changes: 1 addition & 1 deletion solr/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Solr

Docker image for [solr] version 9.4.1.
Docker image for [solr] version 9.5.0.

Please refer to the [Solr Documentation] for more in-depth information.

Expand Down
4 changes: 2 additions & 2 deletions tomcat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
FROM java

ARG TARGETARCH
ARG TOMCAT_VERSION="9.0.87"
ARG TOMCAT_FILE_SHA256="da482fb9220086dbf371e180aa09c6402af8f048586734cdedd4a08c48d4ce02"
ARG TOMCAT_VERSION="9.0.91"
ARG TOMCAT_FILE_SHA256="0c5b29ca1d3a31bbb8fab6ad1feed8a3702ed325d14839550a6774c76c90b856"

EXPOSE 8080

Expand Down
2 changes: 1 addition & 1 deletion tomcat/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Tomcat

Docker image for [Tomcat] version 9.0.71.
Docker image for [Tomcat] version 9.0.91.

Please refer to the [Tomcat Documentation] for more in-depth information.

Expand Down