Skip to content

Bump Ubuntu versions #186

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
GeertJohan merged 1 commit into from
Dec 16, 2020
+12 −8
Merged

Bump Ubuntu versions #186

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
20 changes: 12 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
FROM snapcore/snapcraft AS snapcraft
# Using multi-stage dockerfile to obtain snapcraft binary

FROM ubuntu:bionic AS flutterbuilder
FROM ubuntu:groovy AS flutterbuilder
RUN apt-get update \
&& apt-get install -y \
git curl unzip
# Install Flutter from the beta channel
RUN git clone --single-branch --depth=1 --branch beta https://github.com/flutter/flutter /opt/flutter 2>&1 \
&& /opt/flutter/bin/flutter doctor -v

FROM ubuntu:bionic AS xarbuilder
FROM ubuntu:groovy AS xarbuilder
RUN apt-get update \
&& apt-get install -y \
git libssl1.0-dev libxml2-dev make g++ autoconf
git libssl-dev libxml2-dev make g++ autoconf zlib1g-dev
# Needed to patch configure.ac per https://github.com/mackyle/xar/issues/18
RUN git clone --single-branch --depth=1 --branch xar-1.6.1 https://github.com/mackyle/xar 2>&1 \
&& cd xar/xar \
&& sed -i "s/AC_CHECK_LIB(\[crypto\], \[OpenSSL_add_all_ciphers\], , \[have_libcrypto=\"0\"\])/AC_CHECK_LIB(\[crypto\], \[OPENSSL_init_crypto\], , \[have_libcrypto=\"0\"\])/" configure.ac \
&& ./autogen.sh --noconfigure \
&& ./configure 2>&1 \
&& make 2>&1 \
&& make install 2>&1

FROM ubuntu:bionic AS bomutilsbuilder
FROM ubuntu:groovy AS bomutilsbuilder
RUN apt-get update \
&& apt-get install -y \
git make g++
Expand All @@ -30,7 +32,7 @@ RUN git clone --single-branch --depth=1 --branch 0.2 https://github.com/hogliux/
&& make install 2>&1

# Fixed using https://github.com/AppImage/AppImageKit/issues/828
FROM ubuntu:bionic as appimagebuilder
FROM ubuntu:groovy as appimagebuilder
RUN apt-get update \
&& apt-get install -y \
curl
Expand All @@ -41,8 +43,8 @@ RUN cd /opt \
&& ./appimagetool-x86_64.AppImage --appimage-extract \
&& mv squashfs-root appimagetool

# bionic ships with a too old meson version
FROM ubuntu:focal AS pacmanbuilder
# groovy ships with a too old meson version
FROM ubuntu:groovy AS pacmanbuilder
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install -y \
Expand Down Expand Up @@ -82,9 +84,11 @@ ENV SNAP_ARCH="amd64"

COPY --from=xarbuilder /usr/local/bin/xar /usr/local/bin/xar
COPY --from=xarbuilder /usr/local/lib/libxar.so.1 /usr/local/lib/libxar.so.1
COPY --from=xarbuilder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
COPY --from=xarbuilder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1

COPY --from=bomutilsbuilder /usr/bin/mkbom /usr/bin/mkbom
# Probably shouldn't do that, but it works and nothing breaks
COPY --from=bomutilsbuilder /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/x86_64-linux-gnu/libstdc++.so.6

COPY --from=appimagebuilder /opt/appimagetool /opt/appimagetool
ENV PATH=/opt/appimagetool/usr/bin:$PATH
Expand Down