Skip to content

Update to Debian Bullseye, Alpine 3.15 #249

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

Merged
merged 4 commits into from
Dec 3, 2021
Merged

Update to Debian Bullseye, Alpine 3.15 #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
609e8f9
Update to Debian Bullseye, Alpine 3.15
tianon Dec 1, 2021
6befd08
Fix "passenger" tagging bug
tianon Dec 1, 2021
5ceec0a
Switch from wget back to curl (to fix certificate issues)
tianon Dec 2, 2021
9999693
Add missing variable (and better preamble to catch those issues in th…
tianon Dec 2, 2021
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
8 changes: 5 additions & 3 deletions 4.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-slim-buster
FROM ruby:2.6-slim-bullseye

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand All @@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
wget \
\
bzr \
Expand Down Expand Up @@ -43,7 +44,8 @@ ENV REDMINE_VERSION 4.0.9
ENV REDMINE_DOWNLOAD_SHA256 04a772b0b8f8ce6493614a7cb22ed82cb9b43c75dcdbeb5c2f925bae98e0d5df

RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
Expand All @@ -60,9 +62,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
default-libmysqlclient-dev \
freetds-dev \
gcc \
libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
Expand Down
2 changes: 1 addition & 1 deletion 4.0/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-alpine3.13
FROM ruby:2.6-alpine3.15

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand Down
8 changes: 5 additions & 3 deletions 4.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-slim-buster
FROM ruby:2.6-slim-bullseye

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand All @@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
wget \
\
bzr \
Expand Down Expand Up @@ -46,7 +47,8 @@ ENV REDMINE_VERSION 4.1.5
ENV REDMINE_DOWNLOAD_SHA256 624dfeab7db5cda35a03d791b5fa83a836717ca280856c51cd089ed638f8678e

RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
Expand All @@ -63,9 +65,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
default-libmysqlclient-dev \
freetds-dev \
gcc \
libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
Expand Down
2 changes: 1 addition & 1 deletion 4.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.6-alpine3.13
FROM ruby:2.6-alpine3.15

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand Down
8 changes: 5 additions & 3 deletions 4.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7-slim-buster
FROM ruby:2.7-slim-bullseye

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand All @@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
wget \
\
bzr \
Expand Down Expand Up @@ -46,7 +47,8 @@ ENV REDMINE_VERSION 4.2.3
ENV REDMINE_DOWNLOAD_SHA256 72f633dc954217948558889ca85325fe6410cd18a2d8b39358e5d75932a47a0c

RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
Expand All @@ -63,9 +65,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
default-libmysqlclient-dev \
freetds-dev \
gcc \
libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
Expand Down
2 changes: 1 addition & 1 deletion 4.2/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7-alpine3.13
FROM ruby:2.7-alpine3.15

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:%%RUBY_VERSION%%-alpine3.13
FROM ruby:%%RUBY_VERSION%%-alpine3.15

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile-debian.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:%%RUBY_VERSION%%-slim-buster
FROM ruby:%%RUBY_VERSION%%-slim-bullseye

# explicitly set uid/gid to guarantee that it won't change in the future
# the values 999:999 are identical to the current user/group id assigned
Expand All @@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
wget \
\
bzr \
Expand Down Expand Up @@ -46,7 +47,8 @@ ENV REDMINE_VERSION %%REDMINE_VERSION%%
ENV REDMINE_DOWNLOAD_SHA256 %%REDMINE_DOWNLOAD_SHA256%%

RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
Expand All @@ -63,9 +65,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
default-libmysqlclient-dev \
freetds-dev \
gcc \
libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
Expand Down
22 changes: 12 additions & 10 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu
#!/usr/bin/env bash
set -Eeuo pipefail

declare -A aliases=(
[4.2]='4 latest'
Expand Down Expand Up @@ -68,20 +68,22 @@ join() {
}

for version in "${versions[@]}"; do
# normally this would be down in the other loop, but "passenger" doesn't have it, so this is the simplest option (we just can't ever have "alpine" be out of sync, so we should remove it instead if it ever needs to be out of sync)
commit="$(dirCommit "$version")"
fullVersion="$(git show "$commit":"$version/Dockerfile" | awk '$1 == "ENV" && $2 == "REDMINE_VERSION" { print $3; exit }')"

versionAliases=(
$fullVersion
$version
${aliases[$version]:-}
)

for variant in '' passenger alpine; do
dir="$version${variant:+/$variant}"
[ -f "$dir/Dockerfile" ] || continue

commit="$(dirCommit "$dir")"

fullVersion="$(git show "$commit":"$dir/Dockerfile" | awk '$1 == "ENV" && $2 == "REDMINE_VERSION" { print $3; exit }')"

versionAliases=(
$fullVersion
$version
${aliases[$version]:-}
)

if [ -n "$variant" ]; then
variantAliases=( "${versionAliases[@]/%/-$variant}" )
variantAliases=( "${variantAliases[@]//latest-/}" )
Expand Down