Skip to content

Commit

Permalink
Merge pull request #1113 from atc0005/i1112-fix-alpine-dep-conflicts
Browse files Browse the repository at this point in the history 
Update file and musl-dev package versions
  • Loading branch information
@atc0005
atc0005 authored Aug 1, 2023
2 parents 88a6eee + 5086321 commit d93cb82
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions oldstable/build/alpine-x64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down
4 changes: 2 additions & 2 deletions oldstable/build/alpine-x86/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down
4 changes: 2 additions & 2 deletions stable/build/alpine-x64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down
4 changes: 2 additions & 2 deletions stable/build/alpine-x86/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down
4 changes: 2 additions & 2 deletions unstable/build/alpine-x64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down
4 changes: 2 additions & 2 deletions unstable/build/alpine-x86/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ ENV APK_GCC_VERSION="12.2.1_git20220924-r10"
ENV APK_GIT_VERSION="2.40.1-r0"
ENV APK_MAKE_VERSION="4.4.1-r1"
ENV APK_UTIL_LINUX_VERSION="2.38.1-r8"
ENV APK_FILE_VERSION="5.44-r4"
ENV APK_FILE_VERSION="5.45-r0"
ENV APK_NANO_VERSION="7.2-r1"
ENV APK_MUSL_DEV_VERSION="1.2.4-r0"
ENV APK_MUSL_DEV_VERSION="1.2.4-r1"
ENV APK_XZ_VERSION="5.4.3-r0"

# https://github.com/tc-hib/go-winres/releases
Expand Down

0 comments on commit d93cb82

Please sign in to comment.