Skip to content

Alpine 3.15 #910

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
tianon merged 1 commit into from
Nov 29, 2021
Merged

Alpine 3.15 #910

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
2 changes: 1 addition & 1 deletion 10/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 11/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 12/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 13/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 14/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 9.6/alpine/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN set -eux; \
libxslt-dev \
linux-headers \
{{ if .major >= 11 then ( -}}
llvm11-dev clang g++ \
llvm-dev clang g++ \
{{ ) else "" end -}}
make \
openldap-dev \
Expand Down
12 changes: 6 additions & 6 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"10": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand All @@ -27,7 +27,7 @@
"version": "10.19"
},
"11": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand All @@ -54,7 +54,7 @@
"version": "11.14"
},
"12": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand All @@ -72,7 +72,7 @@
"version": "12.9"
},
"13": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand All @@ -90,7 +90,7 @@
"version": "13.5"
},
"14": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand All @@ -108,7 +108,7 @@
"version": "14.1"
},
"9.6": {
"alpine": "3.14",
"alpine": "3.15",
"bullseye": {
"arches": [
"amd64",
Expand Down
2 changes: 1 addition & 1 deletion versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ allDebianSuites=(
bullseye
stretch
)
defaultAlpineVersion='3.14'
defaultAlpineVersion='3.15'
declare -A alpineVersions=(
#[9.6]='3.5'
)
Expand Down