Compare commits

..

No commits in common. "3ea90c0daad394307892878750a59d3f0b31e806" and "fa5bdeb29eaebe20b050675b3bffa586fb0d1c39" have entirely different histories.

5 changed files with 5 additions and 12 deletions

View File

@ -1,10 +1,6 @@
FROM ubuntu:jammy AS deploy-env FROM ubuntu:focal AS deploy-env
ARG tag ARG tag
COPY deps/ / 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
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 apt clean && rm -rf /var/lib/apt/lists/*
RUN mkdir /ulib RUN mkdir /ulib
RUN cp -rf /lib/*-linux-*/libsqlite3*.so* /ulib RUN cp -rf /lib/*-linux-*/libsqlite3*.so* /ulib
@ -57,11 +53,9 @@ RUN cp -rf /lib/*-linux-*/libkeyutils*.so* /ulib
RUN mkdir /platform RUN mkdir /platform
COPY antos-release/ / COPY antos-release/ /
RUN tar -xzf /build/$tag/AntOS_$(uname -m).tar.gz -C /platform/ RUN tar -xzf /build/$tag/AntOS_$(uname -m).tar.gz -C /platform/
RUN chown -R root:root /platform
RUN tree /platform RUN tree /platform
RUN ls -al /platform
FROM busybox:stable-glibc FROM busybox:1.35-glibc
#copy all necessary libraries #copy all necessary libraries
COPY --from=deploy-env /ulib/ /lib/ COPY --from=deploy-env /ulib/ /lib/
COPY --from=deploy-env /bin/wget /bin/ COPY --from=deploy-env /bin/wget /bin/
@ -81,5 +75,4 @@ RUN chmod 744 /opt/www/runner.ini
COPY start.sh /start.sh COPY start.sh /start.sh
RUN chmod 700 /start.sh RUN chmod 700 /start.sh
# start the entry point
ENTRYPOINT /start.sh ENTRYPOINT /start.sh

2
Jenkinsfile vendored
View File

@ -25,7 +25,7 @@ pipeline{
set -e set -e
cd $WORKSPACE cd $WORKSPACE
tree antos-release tree antos-release
# docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64 docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
for dir in antos-release/build/* ; do for dir in antos-release/build/* ; do
tag=$(basename $dir) tag=$(basename $dir)
echo "BUILD TAG $tag" echo "BUILD TAG $tag"

Binary file not shown.

Binary file not shown.

Binary file not shown.