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

December 2023 Maintenance updates - s6, activemq, tomcat, fits and matomo #318

Merged
merged 1 commit into from
Dec 21, 2023
Merged

December 2023 Maintenance updates - s6, activemq, tomcat, fits and matomo #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.17.6"
ARG ACTIVEMQ_VERSION="5.18.3"
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="e6ad7ac9d1c46262cfab7f34c1f452a9048fc196abdc46ae46574a87e79b4ff4"
ARG ACTIVEMQ_FILE_SHA256="943381aa6d340707de6c42eadbf7b41b7fdf93df604156d972d50c4da783544f"

EXPOSE 61616 5672 61613 1883 61614 8161

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

ARG TARGETARCH
ARG S6_VERSION="3.1.2.1"
ARG S6_VERSION="3.1.6.2"
ARG S6_BASE_URL="https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}"
ARG S6_OVERLAY_NOARCH=s6-overlay-noarch.tar.xz
ARG S6_OVERLAY_NOARCH_SHA256="cee89d3eeabdfe15239b2c5c3581d9352d2197d4fd23bba3f1e64bf916ccf496"
ARG S6_OVERLAY_NOARCH_SHA256="05af2536ec4fb23f087a43ce305f8962512890d7c71572ed88852ab91d1434e3"
ARG S6_OVERLAY_SYMLINKS_ARCH=s6-overlay-symlinks-arch.tar.xz
ARG S6_OVERLAY_SYMLINKS_ARCH_SHA256="1b75ac96ddc953f6b7b10be4f579c3e4f6cdf85270116a539930e03e74066f2f"
ARG S6_OVERLAY_SYMLINKS_ARCH_SHA256="532507ac3eb81b3ce5c7fb76b57a3b61f6a583970de44e76aa43a0eb9a656cbd"
ARG S6_OVERLAY_SYMLINKS_NOARCH=s6-overlay-symlinks-noarch.tar.xz
ARG S6_OVERLAY_SYMLINKS_NOARCH_SHA256="1e36efb936084fddffe6c55dae8f478e7b2d70f77db2caaceb78c7425b9a7956"
ARG S6_OVERLAY_SYMLINKS_NOARCH_SHA256="dfa08e1600a4d119621178e09c5a899df6d4c613e4a0082c01b12a51d21fe84c"
ARG S6_OVERLAY_AMD64=s6-overlay-x86_64.tar.xz
ARG S6_OVERLAY_AMD64_SHA256="6019b6b06cfdbb1d1cd572d46b9b158a4904fd19ca59d374de4ddaaa6a3727d5"
ARG S6_OVERLAY_AMD64_SHA256="95081f11c56e5a351e9ccab4e70c2b1c3d7d056d82b72502b942762112c03d1c"
ARG S6_OVERLAY_ARM64=s6-overlay-aarch64.tar.xz
ARG S6_OVERLAY_ARM64_SHA256="e73f9a021b64f88278830742149c14ef8a52331102881ba025bf32a66a0e7c78"
ARG S6_OVERLAY_ARM64_SHA256="3fc0bae418a0e3811b3deeadfca9cc2f0869fb2f4787ab8a53f6944067d140ee"

LABEL License="MIT License"

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

ARG TARGETARCH
ARG FITSSERVLET_VERSION="1.2.3"
ARG FITSSERVLET_VERSION="2.1.0"
ARG FITSSERVLET_FILE="fits-service-${FITSSERVLET_VERSION}.war"
ARG FITSSERVLET_URL="https://github.com/harvard-lts/FITSservlet/releases/download/${FITSSERVLET_VERSION}/${FITSSERVLET_FILE}"
ARG FITSSERVLET_SHA256="e98450a1617c491976966a307da8b9c783c83e9e1a79bca9dbd9bc6c9a7226cd"
ARG FITSSERVLET_SHA256="ba3c4d5af4dfbe42a32b4321eb96fad8db1379c8b00cd2bc7b7b0e4f59cb7e67"

ARG FITS_VERSION="1.5.5"
ARG FITS_VERSION="1.6.0"
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="48be7ad9f27d9cc0b52c63f1aea1a3814e1b6996ca4e8467e77772c187ac955c"
ARG FITS_SHA256="32e436effe7251c5b067ec3f02321d5baf4944b3f0d1010fb8ec42039d9e3b73"

# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=fits-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
Expand Down
18 changes: 9 additions & 9 deletions matomo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ FROM nginx

ARG TARGETARCH

ARG MATOMO_VERSION=4.15.1
ARG MATOMO_FILE=${MATOMO_VERSION}.tar.gz
ARG MATOMO_URL=https://builds.matomo.org/matomo-${MATOMO_FILE}
ARG MATOMO_SHA256=5e77e2a6b18ba8542a3e4df481c0152dd059de960c49d04f7e789c9bb5753d27

ARG EXTRA_TOOLS_VERSION=4.1.0-beta5
ARG EXTRA_TOOLS_FILE=${EXTRA_TOOLS_VERSION}.tar.gz
ARG EXTRA_TOOLS_URL=https://github.com/digitalist-se/extratools/archive/refs/tags/${EXTRA_TOOLS_FILE}
ARG EXTRA_TOOLS_SHA256=ce9c9f1d01aaf04e3dfded21d6b9080c1fda633535295dc1c8cd0427bcdc826f
ARG MATOMO_VERSION="4.16.0"
ARG MATOMO_FILE="${MATOMO_VERSION}.tar.gz"
ARG MATOMO_URL="https://builds.matomo.org/matomo-${MATOMO_FILE}"
ARG MATOMO_SHA256="385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959"

ARG EXTRA_TOOLS_VERSION="4.1.0-beta5"
ARG EXTRA_TOOLS_FILE="${EXTRA_TOOLS_VERSION}.tar.gz"
ARG EXTRA_TOOLS_URL="https://github.com/digitalist-se/extratools/archive/refs/tags/${EXTRA_TOOLS_FILE}"
ARG EXTRA_TOOLS_SHA256="ce9c9f1d01aaf04e3dfded21d6b9080c1fda633535295dc1c8cd0427bcdc826f"

EXPOSE 8000

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.71"
ARG TOMCAT_FILE_SHA256="d78a3a09a67695d4f391d2e40713eeeb437bb201ad4571d200f9d23cc7868a78"
ARG TOMCAT_VERSION="9.0.84"
ARG TOMCAT_FILE_SHA256="e616951e2e4350bd2dadd65e606b21e5be97e28ce27a0d102060545622ab7ae0"

EXPOSE 8080

Expand Down