Skip to content

Commit

Permalink
[minor] Upgrade alpine to 3.20.2 (#348)
Browse files Browse the repository at this point in the history
Upgrade S6 to 3.2.0.0
Upgrade code-server to 4.91.1
Removed deprecated versions properties from docker compose files
nigelgbanks authored Aug 13, 2024
1 parent 9a2b78c commit 297e2fc
Showing 49 changed files with 15 additions and 67 deletions.
Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@
#
# Tests that the service starts successfully (timeout otherwise).
#
version: "3.8"

x-common: &common
restart: "no"
1 change: 0 additions & 1 deletion alpaca/tests/ServiceStartsWithDefaults/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import plugins.TestsPlugin.DockerComposeUp

tasks.named<DockerComposeUp>("test") {
// Remove 143 when https://github.com/Islandora-Devops/isle-buildkit/issues/269 is resolved.
expectExitCodes("alpaca", 0)
expectOutput("alpaca", "[main] (AlpacaDriver) Alpaca started")
}
1 change: 0 additions & 1 deletion alpaca/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
12 changes: 6 additions & 6 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@
FROM alpine

ARG TARGETARCH
ARG S6_VERSION="3.1.6.2"
ARG S6_VERSION="3.2.0.0"
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="05af2536ec4fb23f087a43ce305f8962512890d7c71572ed88852ab91d1434e3"
ARG S6_OVERLAY_NOARCH_SHA256="4b0c0907e6762814c31850e0e6c6762c385571d4656eb8725852b0b1586713b6"
ARG S6_OVERLAY_SYMLINKS_ARCH=s6-overlay-symlinks-arch.tar.xz
ARG S6_OVERLAY_SYMLINKS_ARCH_SHA256="532507ac3eb81b3ce5c7fb76b57a3b61f6a583970de44e76aa43a0eb9a656cbd"
ARG S6_OVERLAY_SYMLINKS_ARCH_SHA256="5a3f416a082daa498fb77afad1fcaac382ae0990ddd7745ce9ead7308cc23da1"
ARG S6_OVERLAY_SYMLINKS_NOARCH=s6-overlay-symlinks-noarch.tar.xz
ARG S6_OVERLAY_SYMLINKS_NOARCH_SHA256="dfa08e1600a4d119621178e09c5a899df6d4c613e4a0082c01b12a51d21fe84c"
ARG S6_OVERLAY_SYMLINKS_NOARCH_SHA256="598ab9ef6b62809727f0242e895b2c054c3d95f2d3235109856d843a96a47680"
ARG S6_OVERLAY_AMD64=s6-overlay-x86_64.tar.xz
ARG S6_OVERLAY_AMD64_SHA256="95081f11c56e5a351e9ccab4e70c2b1c3d7d056d82b72502b942762112c03d1c"
ARG S6_OVERLAY_AMD64_SHA256="ad982a801bd72757c7b1b53539a146cf715e640b4d8f0a6a671a3d1b560fe1e2"
ARG S6_OVERLAY_ARM64=s6-overlay-aarch64.tar.xz
ARG S6_OVERLAY_ARM64_SHA256="3fc0bae418a0e3811b3deeadfca9cc2f0869fb2f4787ab8a53f6944067d140ee"
ARG S6_OVERLAY_ARM64_SHA256="868973e98210257bba725ff5b17aa092008c9a8e5174499e38ba611a8fc7e473"

LABEL License="MIT License"

1 change: 0 additions & 1 deletion base/tests/EnvironmentOverrideDatabase/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: base-environmentoverridedatabase
services:
1 change: 0 additions & 1 deletion base/tests/EnvironmentPrecedence/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
# Used for testing environment precedence follows what is expected from:
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

secrets:
# Secrets are #2 on the precedence list.
1 change: 0 additions & 1 deletion base/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion base/tests/SigIntExitCode/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# file: docker-compose.yml
#
# Tests that when a service exits, it's exit code is used as the return exit code for the container.
version: "3.8"

x-common: &common
restart: "no"
1 change: 0 additions & 1 deletion base/tests/SigKillExitCode/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# file: docker-compose.yml
#
# Tests that when a service receives a SIGTERM it exits 0 after cleaning up the running services.
version: "3.8"

x-common: &common
restart: "no"
1 change: 0 additions & 1 deletion base/tests/SigTermExitCode/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# file: docker-compose.yml
#
# Tests that when a service exits, it's exit code is used as the return exit code for the container.
version: "3.8"

x-common: &common
restart: "no"
1 change: 0 additions & 1 deletion base/tests/SigTermExitHandled/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# file: docker-compose.yml
#
# Tests that when a service exits, it's exit code is used as the return exit code for the container.
version: "3.8"

x-common: &common
restart: "no"
4 changes: 2 additions & 2 deletions blazegraph/Dockerfile
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ ARG LOG4J_VERSION="2.22.0"
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"
ARG OLD_LOG4J_VERSION="1.2.17"

# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=blazegraph-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
@@ -20,7 +20,7 @@ RUN --mount=type=cache,id=blazegraph-downloads-${TARGETARCH},sharing=locked,targ
--dest "/opt/tomcat/webapps/bigdata" \
&& \
## Remove the outmoded log4j-* files that come with blazegraph
rm -f "/opt/tomcat/webapps/bigdata/WEB-INF/lib/log4j-1.2.17.jar" && \
rm -f "/opt/tomcat/webapps/bigdata/WEB-INF/lib/log4j-${OLD_LOG4J_VERSION}.jar" && \
cleanup.sh

# Now drop in newer log4j-* files
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
15 changes: 3 additions & 12 deletions code-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -49,21 +49,12 @@ RUN --mount=type=cache,id=code-server-apk-${TARGETARCH},sharing=locked,target=/v
spdlog \
sudo \
unison \
yarn \
npm \
&& \
cleanup.sh

RUN --mount=type=cache,id=code-server-npm-${TARGETARCH},sharing=locked,target=/usr/local/share/.cache/yarn \
yarn global add [email protected] && \
yarn global add --ignore-engines --unsafe-perm \
@microsoft/1ds-core-js@^3.2.13 \
[email protected] \
minimist@^1.2.6 \
[email protected] \
@vscode/spdlog@^0.15.0 \
yauzl@^2.9.2 \
yazl@^2.4.3 \
&& \
RUN --mount=type=cache,id=code-server-npm-${TARGETARCH},sharing=locked,target=/root/.npm \
CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global --unsafe-perm [email protected] && \
cleanup.sh

# Drush requires HOME to be set as such.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
8 changes: 4 additions & 4 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
@@ -298,7 +298,7 @@ target "base-common" {
# N.B. This should match the value used in:
# - <https://github.com/Islandora-Devops/isle-imagemagick>
# - <https://github.com/Islandora-Devops/isle-leptonica>
alpine = "docker-image://alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b"
alpine = "docker-image://alpine:3.20.2@sha256:0a4eaa0eecf5f8c050e5bba433f58c052be7587ee8af3e8b3910ef9ab5fbe9f5"
}
}

@@ -317,7 +317,7 @@ target "code-server-common" {
context = "code-server"
contexts = {
# Produced by this repository <https://github.com/Islandora-Devops/isle-nodejs>.
nodejs = "docker-image://islandora/nodejs:alpine-3.19.1-nodejs-18.19.1-r0@sha256:90581c114e819cfb74a6cb22a34798bed05fb0cd0bacb7b60913ea3b7c2943b6"
nodejs = "docker-image://islandora/nodejs:alpine-3.20.2-nodejs-20.15.1-r0@sha256:4f377ed5bbb832c51ee9f4b898555ffae0dfdd21f4becc5ac7e26cdf235ed004"
}
}

@@ -361,7 +361,7 @@ target "houdini-common" {
context = "houdini"
contexts = {
# Produced by this repository <https://github.com/Islandora-Devops/isle-imagemagick>.
imagemagick = "docker-image://islandora/imagemagick:alpine-3.19.1-imagemagick-7.1.1.26-r0@sha256:82db5dc45ea392f9797d3ce7471d9c578589e8ee9725f84abdf281e27660be6e"
imagemagick = "docker-image://islandora/imagemagick:alpine-3.20.2-imagemagick-7.1.1.36-r0@sha256:a1fa03a18e7e232e380d070d196dc2c0e0a8762dd385640b932e28fcacfd9b05"
}
}

@@ -370,7 +370,7 @@ target "hypercube-common" {
context = "hypercube"
contexts = {
# Produced by this repository <https://github.com/Islandora-Devops/isle-leptonica>.
leptonica = "docker-image://islandora/leptonica:alpine-3.19.1-leptonica-1.83.1-r0@sha256:265add7dd91404bf68ddc4836a945f7d810bbbd780959854f299b2419401e158"
leptonica = "docker-image://islandora/leptonica:alpine-3.20.2-leptonica-1.84.1-r0@sha256:9e9e46a328d8b55a61a352a6b06ff175f98e40cd5773c9bf93aac58fb56b65f7"
}
}

1 change: 0 additions & 1 deletion docker-compose.darwin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
ide:
environment:
1 change: 0 additions & 1 deletion docker-compose.linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.8"
services:
ide:
environment:
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
restart: "no"
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
# Tests that we can bring up the demo site.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: drupal-servicestartswithbackendmysql
services:
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
# Tests that we can bring up the demo site.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: drupal-servicestartswithbackendpostgresql
services:
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

x-common: &common
restart: "no"
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

x-common: &common
restart: "no"
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"
x-common: &common
restart: "no"

1 change: 0 additions & 1 deletion fits/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: handle-servicestartswithbackendmysql
services:
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: handle-servicestartswithbackendpostgresql
services:
1 change: 0 additions & 1 deletion homarus/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion houdini/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion mariadb/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion matomo/tests/Installation/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
# Tests the following:
# - Site is installed correctly.
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion matomo/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
# overridden by prefixing them.
#
# `base/rootfs/etc/cont-init.d/00-container-environment-00-init.sh`
version: "3.8"

name: matomo-servicestartswithdefaults
services:
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -54,7 +54,6 @@ RUN --mount=type=cache,id=nginx-apk-${TARGETARCH},sharing=locked,target=/var/cac
php83-xsl \
php83-zip \
&& \
ln -s /usr/bin/php83 /usr/bin/php && \
addgroup nginx jwt && \
cleanup.sh

1 change: 0 additions & 1 deletion nginx/tests/ServiceLogsClientIp/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion nginx/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# file: docker-compose.yml
version: "3.8"

name: riprap-servicestartswithbackendmysql
services:
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# file: docker-compose.yml
version: "3.8"

name: riprap-servicestartswithbackendsqlite
services:
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# file: docker-compose.yml
version: "3.8"

name: riprap-servicestartswithbackendpostgresql
services:
1 change: 0 additions & 1 deletion solr/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion test/tests/IntegrationTests/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
# - Content is index in Fedora.
# - Matomo is installed?
---
version: "3.8"

# Common to all services
x-common: &common
1 change: 0 additions & 1 deletion tomcat/tests/ServiceStartsWithDefaults/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.8"

# Common to all services
x-common: &common

0 comments on commit 297e2fc

Please sign in to comment.