From 57615bebc1613b6e33a64c05b5c6924907ab6e2e Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Mon, 6 Jan 2020 09:59:51 -0500 Subject: [PATCH 1/9] Rebase to Apline 3.11 --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- readme-vars.yml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7af1adb..96ea965 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:3.8 as buildstage +FROM lsiobase/alpine:3.11 as buildstage ############## build stage ############## ARG DAAPD_RELEASE @@ -84,7 +84,7 @@ RUN \ make DESTDIR=/tmp/daapd-build install && \ mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig ############## runtime stage ############## -FROM lsiobase/alpine:3.8 +FROM lsiobase/alpine:3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3bfa092..ebc1281 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm64v8-3.8 as buildstage +FROM lsiobase/alpine:arm64v8-3.11 as buildstage ############## build stage ############## ARG DAAPD_RELEASE @@ -84,7 +84,7 @@ RUN \ make DESTDIR=/tmp/daapd-build install && \ mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig ############## runtime stage ############## -FROM lsiobase/alpine:arm64v8-3.8 +FROM lsiobase/alpine:arm64v8-3.11 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c199f33..4a973f5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine:arm32v7-3.8 as buildstage +FROM lsiobase/alpine:arm32v7-3.11 as buildstage ############## build stage ############## ARG DAAPD_RELEASE @@ -84,7 +84,7 @@ RUN \ make DESTDIR=/tmp/daapd-build install && \ mv /tmp/daapd-build/etc/forked-daapd.conf /tmp/daapd-build/etc/forked-daapd.conf.orig ############## runtime stage ############## -FROM lsiobase/alpine:arm32v7-3.8 +FROM lsiobase/alpine:arm32v7-3.11 # set version label ARG BUILD_DATE diff --git a/readme-vars.yml b/readme-vars.yml index 244c1b7..149a67c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -53,6 +53,7 @@ app_setup_block: | # changelog changelogs: + - { date: "06.01.20:", desc: "Rebase to alpine linux 3.11." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "14.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "20.08.18:", desc: "Rebase to alpine linux 3.8." } From 79e12bd02e6576332b6fac5c17c3245321e0cd01 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Wed, 15 Jan 2020 10:04:45 -0500 Subject: [PATCH 2/9] Install libantlr3c before libantlr3c-dev --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96ea965..70a393d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,6 +42,7 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ libantlr3c-dev \ mxml-dev && \ echo "**** make antlr wrapper and compile forked-daapd ****" && \ @@ -113,7 +114,6 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ebc1281..f7b7794 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -42,6 +42,7 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ libantlr3c-dev \ mxml-dev && \ echo "**** make antlr wrapper and compile forked-daapd ****" && \ @@ -113,7 +114,6 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4a973f5..a818aa8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -42,6 +42,7 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ libantlr3c-dev \ mxml-dev && \ echo "**** make antlr wrapper and compile forked-daapd ****" && \ @@ -113,7 +114,6 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files From 74b194b42a78a7765ed43130fc613874452c0167 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Wed, 15 Jan 2020 10:29:10 -0500 Subject: [PATCH 3/9] need libantlr3c at runtime too --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 70a393d..b3c73b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,6 +114,7 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ mxml # copy buildstage and local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f7b7794..cb3de03 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -114,6 +114,7 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ mxml # copy buildstage and local files diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a818aa8..27fb54e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -114,6 +114,7 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ + libantlr3c \ mxml # copy buildstage and local files From a9c4a91f882d323a9ec53de375d6ba204bf7f503 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 19:20:12 -0500 Subject: [PATCH 4/9] Build antlr from source --- Dockerfile | 18 ++++++++++++++---- Dockerfile.aarch64 | 18 ++++++++++++++---- Dockerfile.armhf | 18 ++++++++++++++---- readme-vars.yml | 2 +- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3c73b5..83be883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,10 +42,8 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ - libantlr3c-dev \ mxml-dev && \ - echo "**** make antlr wrapper and compile forked-daapd ****" && \ + echo "**** make antlr wrapper ****" && \ mkdir -p \ /tmp/source/forked-daapd && \ echo \ @@ -56,6 +54,18 @@ RUN \ curl -o \ /tmp/source/antlr-3.4-complete.jar -L \ http://www.antlr3.org/download/antlr-3.4-complete.jar && \ + echo "**** compile and install antlr3c ****" && \ + curl -o \ + /tmp/libantlr3c-3.4.tar.gz -L \ + https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ + tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ + cd /tmp/libantlr3c-3.4 && \ + ./configure --enable-64bit --prefix=/usr && \ + make && \ + make DESTDIR=/tmp/antlr3c-build install && \ + export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \ + export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \ + echo "**** compile forked-daapd ****" && \ if [ -z ${DAAPD_RELEASE+x} ]; then \ DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -114,11 +124,11 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files COPY --from=buildstage /tmp/daapd-build/ / +COPY --from=buildstage /tmp/antlr3c-build/ / COPY root/ / # ports and volumes diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index cb3de03..20c8b43 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -42,10 +42,8 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ - libantlr3c-dev \ mxml-dev && \ - echo "**** make antlr wrapper and compile forked-daapd ****" && \ + echo "**** make antlr wrapper ****" && \ mkdir -p \ /tmp/source/forked-daapd && \ echo \ @@ -56,6 +54,18 @@ RUN \ curl -o \ /tmp/source/antlr-3.4-complete.jar -L \ http://www.antlr3.org/download/antlr-3.4-complete.jar && \ + echo "**** compile and install antlr3c ****" && \ + curl -o \ + /tmp/libantlr3c-3.4.tar.gz -L \ + https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ + tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ + cd /tmp/libantlr3c-3.4 && \ + ./configure --enable-64bit --prefix=/usr && \ + make && \ + make DESTDIR=/tmp/antlr3c-build install && \ + export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \ + export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \ + echo "**** compile forked-daapd ****" && \ if [ -z ${DAAPD_RELEASE+x} ]; then \ DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -114,11 +124,11 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files COPY --from=buildstage /tmp/daapd-build/ / +COPY --from=buildstage /tmp/antlr3c-build/ / COPY root/ / # ports and volumes diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 27fb54e..c016160 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -42,10 +42,8 @@ RUN \ tar && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ - libantlr3c-dev \ mxml-dev && \ - echo "**** make antlr wrapper and compile forked-daapd ****" && \ + echo "**** make antlr wrapper ****" && \ mkdir -p \ /tmp/source/forked-daapd && \ echo \ @@ -56,6 +54,18 @@ RUN \ curl -o \ /tmp/source/antlr-3.4-complete.jar -L \ http://www.antlr3.org/download/antlr-3.4-complete.jar && \ + echo "**** compile and install antlr3c ****" && \ + curl -o \ + /tmp/libantlr3c-3.4.tar.gz -L \ + https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ + tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ + cd /tmp/libantlr3c-3.4 && \ + ./configure --enable-64bit --prefix=/usr && \ + make && \ + make DESTDIR=/tmp/antlr3c-build install && \ + export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \ + export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \ + echo "**** compile forked-daapd ****" && \ if [ -z ${DAAPD_RELEASE+x} ]; then \ DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -114,11 +124,11 @@ RUN \ sqlite-libs && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ - libantlr3c \ mxml # copy buildstage and local files COPY --from=buildstage /tmp/daapd-build/ / +COPY --from=buildstage /tmp/antlr3c-build/ / COPY root/ / # ports and volumes diff --git a/readme-vars.yml b/readme-vars.yml index 149a67c..8f61bb8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -53,7 +53,7 @@ app_setup_block: | # changelog changelogs: - - { date: "06.01.20:", desc: "Rebase to alpine linux 3.11." } + - { date: "16.01.20:", desc: "Rebase to alpine linux 3.11 and build antlr3c from source." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "14.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "20.08.18:", desc: "Rebase to alpine linux 3.8." } From ed1ad25f525e53df48ec595e0f9a08a4d8920926 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 19:31:29 -0500 Subject: [PATCH 5/9] trying something to see if this fixes the armhf build --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c016160..5d7eb71 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -60,7 +60,7 @@ RUN \ https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ cd /tmp/libantlr3c-3.4 && \ - ./configure --enable-64bit --prefix=/usr && \ + ./configure --build arm-unknown-linux-gnueabi --disable-abiflags --disable-antlrdebug --prefix=/usr && \ make && \ make DESTDIR=/tmp/antlr3c-build install && \ export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \ From 118ff79988703756587e0dbf657650653ed982ba Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 19:41:16 -0500 Subject: [PATCH 6/9] again, completely guessing, but this might fix the arm64 build --- Dockerfile.aarch64 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 20c8b43..dd170bd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,6 +60,7 @@ RUN \ https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ cd /tmp/libantlr3c-3.4 && \ + autoreconf -i -v && \ ./configure --enable-64bit --prefix=/usr && \ make && \ make DESTDIR=/tmp/antlr3c-build install && \ From 6893287837429920638f70a597a4eaac1c4e1445 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 19:52:06 -0500 Subject: [PATCH 7/9] Revert "again, completely guessing, but this might fix the arm64 build" This reverts commit 118ff79988703756587e0dbf657650653ed982ba. --- Dockerfile.aarch64 | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dd170bd..20c8b43 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,7 +60,6 @@ RUN \ https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ cd /tmp/libantlr3c-3.4 && \ - autoreconf -i -v && \ ./configure --enable-64bit --prefix=/usr && \ make && \ make DESTDIR=/tmp/antlr3c-build install && \ From 412dc759eacc60c2271e0f158aeec639da003804 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 20:54:33 -0500 Subject: [PATCH 8/9] aarch64 builds now --- Dockerfile.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 20c8b43..10b5b11 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,7 +60,7 @@ RUN \ https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ cd /tmp/libantlr3c-3.4 && \ - ./configure --enable-64bit --prefix=/usr && \ + ./configure --build arm-unknown-linux-gnueabi --disable-abiflags --disable-antlrdebug --enable-64bit --prefix=/usr && \ make && \ make DESTDIR=/tmp/antlr3c-build install && \ export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \ From c327c0d4b3f313193d7bb28177304a7980f076b6 Mon Sep 17 00:00:00 2001 From: Aaron Bernstein Date: Thu, 16 Jan 2020 21:02:55 -0500 Subject: [PATCH 9/9] armhf builds too! --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5d7eb71..c0e94ca 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -60,7 +60,7 @@ RUN \ https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \ tar xf /tmp/libantlr3c-3.4.tar.gz -C /tmp && \ cd /tmp/libantlr3c-3.4 && \ - ./configure --build arm-unknown-linux-gnueabi --disable-abiflags --disable-antlrdebug --prefix=/usr && \ + ./configure --build arm-unknown-linux-gnueabihf --disable-abiflags --disable-antlrdebug --prefix=/usr && \ make && \ make DESTDIR=/tmp/antlr3c-build install && \ export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \