diff --git a/Dockerfile b/Dockerfile index 8969a70..f56c1d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,17 @@ -FROM ubuntu:focal AS deploy-env +FROM ubuntu:jammy AS deploy-env ARG tag -RUN apt-get update && apt-get --yes --no-install-recommends install libsqlite3-0 zlib1g libreadline8 libssl1.1 wget libvncclient1 libjpeg-turbo8 openssh-client tar tree +COPY deps/ / + +# fix libc-bin bug on ARM64 +RUN dpkg --remove --force-remove-reinstreq libc-bin +RUN dpkg --purge libc-bin +RUN apt install libc-bin --yes --no-install-recommends +RUN rm /var/cache/ldconfig/aux-cache +RUN /sbin/ldconfig + +RUN dpkg -i /libssl1.1_1.1.1f-$(uname -m).deb +# manual install libssl1.1 +RUN apt-get update && apt-get --yes --no-install-recommends install libsqlite3-0 zlib1g libreadline8 wget libvncclient1 libjpeg-turbo8 openssh-client tar tree RUN apt clean && rm -rf /var/lib/apt/lists/* RUN mkdir /ulib RUN cp -rf /lib/*-linux-*/libsqlite3*.so* /ulib @@ -55,7 +66,7 @@ COPY antos-release/ / RUN tar -xzf /build/$tag/AntOS_$(uname -m).tar.gz -C /platform/ RUN tree /platform -FROM busybox:1.34-glibc +FROM busybox:stable-glibc #copy all necessary libraries COPY --from=deploy-env /ulib/ /lib/ COPY --from=deploy-env /bin/wget /bin/ @@ -75,4 +86,5 @@ RUN chmod 744 /opt/www/runner.ini COPY start.sh /start.sh RUN chmod 700 /start.sh +# start the entry point ENTRYPOINT /start.sh diff --git a/Jenkinsfile b/Jenkinsfile index dbbfe05..68a3268 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,4 +39,4 @@ pipeline{ } } } -} \ No newline at end of file +} diff --git a/deps/libssl1.1_1.1.1f-aarch64.deb b/deps/libssl1.1_1.1.1f-aarch64.deb new file mode 100644 index 0000000..474e5e9 Binary files /dev/null and b/deps/libssl1.1_1.1.1f-aarch64.deb differ diff --git a/deps/libssl1.1_1.1.1f-armv7l.deb b/deps/libssl1.1_1.1.1f-armv7l.deb new file mode 100644 index 0000000..9162056 Binary files /dev/null and b/deps/libssl1.1_1.1.1f-armv7l.deb differ diff --git a/deps/libssl1.1_1.1.1f-x86_64.deb b/deps/libssl1.1_1.1.1f-x86_64.deb new file mode 100644 index 0000000..9a05caa Binary files /dev/null and b/deps/libssl1.1_1.1.1f-x86_64.deb differ