Skip to content

Commit fcaec0f

Browse files
authored
Merge branch 'master' into base-auth-fix
2 parents 0936855 + d5d4fc8 commit fcaec0f

File tree

6 files changed

+28
-26
lines changed

6 files changed

+28
-26
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:3.9
1+
FROM lsiobase/alpine:3.10
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm64v8-3.9
1+
FROM lsiobase/alpine:arm64v8-3.10
22

33
# set version label
44
ARG BUILD_DATE

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm32v7-3.9
1+
FROM lsiobase/alpine:arm32v7-3.10
22

33
# set version label
44
ARG BUILD_DATE

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
158158
## Versions
159159

160160
* **01.07.19:** - Fall back to base64 encoding when basic http auth is used.
161+
* **28.06.19:** - Rebasing to alpine 3.10.
161162
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
162163
* **22.02.19:** - Rebasing to alpine 3.9.
163164
* **18.09.18:** - Update pip

package_versions.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
alpine-baselayout-3.1.0-r3
2-
alpine-keys-2.1-r1
3-
apk-tools-2.10.3-r1
4-
bash-4.4.19-r1
5-
busybox-1.29.3-r10
1+
alpine-baselayout-3.1.2-r0
2+
alpine-keys-2.1-r2
3+
apk-tools-2.10.4-r1
4+
bash-5.0.0-r0
5+
busybox-1.30.1-r2
66
ca-certificates-20190108-r0
77
ca-certificates-cacert-20190108-r0
8-
coreutils-8.30-r0
8+
coreutils-8.31-r0
99
db-5.3.28-r1
10-
expat-2.2.6-r0
10+
expat-2.2.7-r0
1111
gdbm-1.13-r1
12-
libacl-2.2.52-r5
13-
libattr-2.4.47-r7
12+
libacl-2.2.52-r6
13+
libattr-2.4.48-r0
1414
libbz2-1.0.6-r6
1515
libc-utils-0.7.1-r0
16-
libcrypto1.1-1.1.1b-r1
16+
libcrypto1.1-1.1.1c-r0
1717
libffi-3.2.1-r6
1818
libldap-2.4.47-r2
19-
libsasl-2.1.27-r1
20-
libssl1.1-1.1.1b-r1
21-
libtls-standalone-2.7.4-r6
22-
linux-pam-1.3.0-r0
23-
musl-1.1.20-r4
24-
musl-utils-1.1.20-r4
25-
ncurses-libs-6.1_p20190105-r0
26-
ncurses-terminfo-6.1_p20190105-r0
27-
ncurses-terminfo-base-6.1_p20190105-r0
28-
py-setuptools-40.6.3-r0
19+
libsasl-2.1.27-r3
20+
libssl1.1-1.1.1c-r0
21+
libtls-standalone-2.9.1-r0
22+
linux-pam-1.3.0-r1
23+
musl-1.1.22-r2
24+
musl-utils-1.1.22-r2
25+
ncurses-libs-6.1_p20190518-r0
26+
ncurses-terminfo-6.1_p20190518-r0
27+
ncurses-terminfo-base-6.1_p20190518-r0
28+
py-setuptools-40.8.0-r1
2929
py2-pip-18.1-r0
3030
python2-2.7.16-r1
31-
readline-7.0.003-r1
31+
readline-8.0.0-r0
3232
scanelf-1.2.3-r0
33-
shadow-4.5-r2
33+
shadow-4.6-r2
3434
sqlite-libs-3.28.0-r0
35-
ssl_client-1.29.3-r10
35+
ssl_client-1.30.1-r2
3636
tzdata-2019a-r0
3737
xz-5.2.4-r0
3838
xz-libs-5.2.4-r0

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ app_setup_block: |
3535
# changelog
3636
changelogs:
3737
- { date: "01.07.19:", desc: "Fall back to base64 encoding when basic http auth is used." }
38+
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
3839
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
3940
- { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
4041
- { date: "18.09.18:", desc: "Update pip" }

0 commit comments

Comments
 (0)